Completed
Push — master ( 62b222...3fdac6 )
by
unknown
07:01
created
includes/assets.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 use SimpleCalendar\Abstracts\Calendar_View;
10 10
 
11
-if ( ! defined( 'ABSPATH' ) ) {
11
+if ( ! defined('ABSPATH')) {
12 12
 	exit;
13 13
 }
14 14
 
@@ -60,16 +60,16 @@  discard block
 block discarded – undo
60 60
 	 */
61 61
 	public function __construct() {
62 62
 
63
-		$this->min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG == true ) ? '' : '.min';
63
+		$this->min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG == true) ? '' : '.min';
64 64
 
65
-		$settings = get_option( 'simple-calendar_settings_advanced' );
65
+		$settings = get_option('simple-calendar_settings_advanced');
66 66
 
67
-		if ( isset( $settings['assets']['disable_css'] ) ) {
67
+		if (isset($settings['assets']['disable_css'])) {
68 68
 			$this->disable_styles = 'yes' == $settings['assets']['disable_css'] ? true : false;
69 69
 		}
70 70
 
71
-		add_action( 'init', array( $this, 'register' ), 20 );
72
-		add_action( 'init', array( $this, 'enqueue' ), 40 );
71
+		add_action('init', array($this, 'register'), 20);
72
+		add_action('init', array($this, 'enqueue'), 40);
73 73
 	}
74 74
 
75 75
 	/**
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 * @since 3.0.0
79 79
 	 */
80 80
 	public function register() {
81
-		do_action( 'simcal_register_assets', $this->min );
81
+		do_action('simcal_register_assets', $this->min);
82 82
 	}
83 83
 
84 84
 	/**
@@ -88,25 +88,25 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function enqueue() {
90 90
 
91
-		add_action( 'wp_enqueue_scripts', array( $this, 'load' ), 10 );
91
+		add_action('wp_enqueue_scripts', array($this, 'load'), 10);
92 92
 
93
-		do_action( 'simcal_enqueue_assets', $this->min );
93
+		do_action('simcal_enqueue_assets', $this->min);
94 94
 
95 95
 
96 96
 		$min = $this->min;
97 97
 		// Improves compatibility with themes and plugins using Isotope and Masonry.
98
-		add_action( 'wp_enqueue_scripts',
99
-			function () use ( $min ) {
100
-				if ( wp_script_is( 'simcal-qtip', 'enqueued' ) ) {
98
+		add_action('wp_enqueue_scripts',
99
+			function() use ($min) {
100
+				if (wp_script_is('simcal-qtip', 'enqueued')) {
101 101
 					wp_enqueue_script(
102 102
 						'simplecalendar-imagesloaded',
103
-						SIMPLE_CALENDAR_ASSETS . 'js/vendor/imagesloaded.pkgd' . $min . '.js',
104
-						array( 'simcal-qtip' ),
103
+						SIMPLE_CALENDAR_ASSETS.'js/vendor/imagesloaded.pkgd'.$min.'.js',
104
+						array('simcal-qtip'),
105 105
 						'3.1.8',
106 106
 						true
107 107
 					);
108 108
 				}
109
-			}, 1000 );
109
+			}, 1000);
110 110
 	}
111 111
 
112 112
 	/**
@@ -118,34 +118,34 @@  discard block
 block discarded – undo
118 118
 
119 119
 		$types = simcal_get_calendar_types();
120 120
 
121
-		foreach ( $types as $calendar => $views ) {
122
-			foreach( $views as $key => $view ) {
121
+		foreach ($types as $calendar => $views) {
122
+			foreach ($views as $key => $view) {
123 123
 
124
-				$view = simcal_get_calendar_view( 0, $calendar . '-' . $view );
124
+				$view = simcal_get_calendar_view(0, $calendar.'-'.$view);
125 125
 
126
-				$scripts[] = $view->scripts( $this->min );
127
-				$styles[] = $view->styles( $this->min );
126
+				$scripts[] = $view->scripts($this->min);
127
+				$styles[] = $view->styles($this->min);
128 128
 			}
129 129
 		}
130 130
 
131 131
 		$this->get_widgets_assets();
132
-		$this->scripts = apply_filters( 'simcal_front_end_scripts', $scripts, $this->min );
132
+		$this->scripts = apply_filters('simcal_front_end_scripts', $scripts, $this->min);
133 133
 		// First check if there is a multi-dimensional array of scripts
134
-		if ( isset( $this->scripts[0] ) ) {
135
-			foreach ( $this->scripts as $script ) {
136
-				$this->load_scripts ( $script );
134
+		if (isset($this->scripts[0])) {
135
+			foreach ($this->scripts as $script) {
136
+				$this->load_scripts($script);
137 137
 			}
138 138
 		} else {
139
-			$this->load_scripts( $this->scripts );
139
+			$this->load_scripts($this->scripts);
140 140
 		}
141
-		$this->styles = apply_filters( 'simcal_front_end_styles', $styles, $this->min );
141
+		$this->styles = apply_filters('simcal_front_end_styles', $styles, $this->min);
142 142
 		// First check if there is a multi-dimensional array of styles
143
-		if ( isset( $this->styles[0] ) ) {
144
-			foreach( $this->styles as $style ) {
145
-				$this->load_styles( $style );
143
+		if (isset($this->styles[0])) {
144
+			foreach ($this->styles as $style) {
145
+				$this->load_styles($style);
146 146
 			}
147 147
 		} else {
148
-			$this->load_styles( $this->styles );
148
+			$this->load_styles($this->styles);
149 149
 		}
150 150
 	}
151 151
 
@@ -156,25 +156,25 @@  discard block
 block discarded – undo
156 156
 	 */
157 157
 	public function get_widgets_assets() {
158 158
 
159
-		$widgets = get_option( 'widget_gce_widget' );
159
+		$widgets = get_option('widget_gce_widget');
160 160
 
161
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
161
+		if ( ! empty($widgets) && is_array($widgets)) {
162 162
 
163
-			foreach ( $widgets as $settings ) {
163
+			foreach ($widgets as $settings) {
164 164
 
165
-				if ( ! empty( $settings ) && is_array( $settings ) ) {
165
+				if ( ! empty($settings) && is_array($settings)) {
166 166
 
167
-					if ( isset( $settings['calendar_id'] ) ) {
167
+					if (isset($settings['calendar_id'])) {
168 168
 
169
-						$view = simcal_get_calendar_view( absint( $settings['calendar_id'] ) );
169
+						$view = simcal_get_calendar_view(absint($settings['calendar_id']));
170 170
 
171
-						if ( $view instanceof Calendar_View ) {
172
-							add_filter( 'simcal_front_end_scripts', function ( $scripts, $min ) use ( $view ) {
173
-								return array_merge( $scripts, $view->scripts( $min ) );
174
-							}, 100, 2 );
175
-							add_filter( 'simcal_front_end_styles', function ( $styles, $min ) use ( $view ) {
176
-								return array_merge( $styles, $view->styles( $min ) );
177
-							}, 100, 2 );
171
+						if ($view instanceof Calendar_View) {
172
+							add_filter('simcal_front_end_scripts', function($scripts, $min) use ($view) {
173
+								return array_merge($scripts, $view->scripts($min));
174
+							}, 100, 2);
175
+							add_filter('simcal_front_end_styles', function($styles, $min) use ($view) {
176
+								return array_merge($styles, $view->styles($min));
177
+							}, 100, 2);
178 178
 						}
179 179
 
180 180
 					}
@@ -192,42 +192,42 @@  discard block
 block discarded – undo
192 192
 	 *
193 193
 	 * @param array $scripts
194 194
 	 */
195
-	public function load_scripts( $scripts ) {
195
+	public function load_scripts($scripts) {
196 196
 
197 197
 		// Only load if not disabled in the settings
198
-		if ( ! empty( $scripts ) && is_array( $scripts ) ) {
198
+		if ( ! empty($scripts) && is_array($scripts)) {
199 199
 
200
-			foreach ( $scripts as $script => $v ) {
200
+			foreach ($scripts as $script => $v) {
201 201
 
202 202
 				/** Plugin compatibility fixes */
203 203
 
204 204
 				// Dequeue moment.js if detected from WP Simple Pay Pro.
205
-				if ( ( wp_script_is( 'stripe-checkout-pro-moment', 'enqueued' ) ) && $script == 'simcal-fullcal-moment' ) {
205
+				if ((wp_script_is('stripe-checkout-pro-moment', 'enqueued')) && $script == 'simcal-fullcal-moment') {
206 206
 					continue;
207 207
 				}
208 208
 
209
-				if ( ! empty( $v['src'] ) ) {
209
+				if ( ! empty($v['src'])) {
210 210
 
211 211
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
212 212
 					// TODO Rework dependencies part (or remove completely).
213 213
 
214
-					$src        = esc_url( $v['src'] );
214
+					$src        = esc_url($v['src']);
215 215
 					//$deps       = isset( $v['deps'] )        ? $v['deps']       : array();
216
-					$ver        = isset( $v['ver'] )         ? $v['ver']        : SIMPLE_CALENDAR_VERSION;
217
-					$in_footer  = isset( $v['in_footer'] )   ? $v['in_footer']  : false;
216
+					$ver        = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
217
+					$in_footer  = isset($v['in_footer']) ? $v['in_footer'] : false;
218 218
 
219 219
 					//wp_enqueue_script( $script, $src, $deps, $ver, $in_footer );
220
-					wp_enqueue_script( $script, $src, array(), $ver, $in_footer );
220
+					wp_enqueue_script($script, $src, array(), $ver, $in_footer);
221 221
 
222
-					if ( ! empty( $v['localize'] ) && is_array( $v['localize'] ) ) {
223
-						foreach ( $v['localize'] as $object => $l10n ) {
224
-							wp_localize_script( $script, $object, $l10n );
222
+					if ( ! empty($v['localize']) && is_array($v['localize'])) {
223
+						foreach ($v['localize'] as $object => $l10n) {
224
+							wp_localize_script($script, $object, $l10n);
225 225
 						}
226 226
 					}
227 227
 
228
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
228
+				} elseif (is_string($v) && ! empty($v)) {
229 229
 
230
-					wp_enqueue_script( $v );
230
+					wp_enqueue_script($v);
231 231
 				}
232 232
 			}
233 233
 
@@ -241,29 +241,29 @@  discard block
 block discarded – undo
241 241
 	 *
242 242
 	 * @param array $styles
243 243
 	 */
244
-	public function load_styles( $styles ) {
244
+	public function load_styles($styles) {
245 245
 
246 246
 		// Only load if not disabled in the settings
247
-		if ( ! empty( $styles ) && is_array( $styles ) && false === $this->disable_styles ) {
247
+		if ( ! empty($styles) && is_array($styles) && false === $this->disable_styles) {
248 248
 
249
-			foreach ( $styles as $style => $v ) {
249
+			foreach ($styles as $style => $v) {
250 250
 
251
-				if ( ! empty( $v['src'] ) ) {
251
+				if ( ! empty($v['src'])) {
252 252
 
253 253
 					// Enqueued individually so we can dequeue if already enqueued by another plugin.
254 254
 					// TODO Rework dependencies part (or remove completely).
255 255
 
256
-					$src    = esc_url( $v['src'] );
256
+					$src    = esc_url($v['src']);
257 257
 					//$deps   = isset( $v['deps'] )   ? $v['deps']    : array();
258
-					$ver    = isset( $v['ver'] )    ? $v['ver']     : SIMPLE_CALENDAR_VERSION;
259
-					$media  = isset( $v['media'] )  ? $v['media']   : 'all';
258
+					$ver    = isset($v['ver']) ? $v['ver'] : SIMPLE_CALENDAR_VERSION;
259
+					$media  = isset($v['media']) ? $v['media'] : 'all';
260 260
 
261 261
 					//wp_enqueue_style( $style, $src, $deps, $ver, $media );
262
-					wp_enqueue_style( $style, $src, array(), $ver, $media );
262
+					wp_enqueue_style($style, $src, array(), $ver, $media);
263 263
 
264
-				} elseif ( is_string( $v ) && ! empty( $v ) ) {
264
+				} elseif (is_string($v) && ! empty($v)) {
265 265
 
266
-					wp_enqueue_style( $v );
266
+					wp_enqueue_style($v);
267 267
 				}
268 268
 
269 269
 			}
Please login to merge, or discard this patch.
includes/calendars/views/default-calendar-grid.php 1 patch
Spacing   +147 added lines, -147 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 use SimpleCalendar\Events\Event;
14 14
 use SimpleCalendar\Calendars\Default_Calendar;
15 15
 
16
-if ( ! defined( 'ABSPATH' ) ) {
16
+if ( ! defined('ABSPATH')) {
17 17
 	exit;
18 18
 }
19 19
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 *
56 56
 	 * @param string|Calendar $calendar
57 57
 	 */
58
-	public function __construct( $calendar = '' ) {
58
+	public function __construct($calendar = '') {
59 59
 		$this->calendar = $calendar;
60 60
 	}
61 61
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @return string
90 90
 	 */
91 91
 	public function get_name() {
92
-		return __( 'Grid', 'google-calendar-events' );
92
+		return __('Grid', 'google-calendar-events');
93 93
 	}
94 94
 
95 95
 	/**
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	 * @since 3.0.0
99 99
 	 */
100 100
 	public function add_ajax_actions() {
101
-		add_action( 'wp_ajax_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
102
-		add_action( 'wp_ajax_nopriv_simcal_default_calendar_draw_grid', array( $this, 'draw_grid_ajax' ) );
101
+		add_action('wp_ajax_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
102
+		add_action('wp_ajax_nopriv_simcal_default_calendar_draw_grid', array($this, 'draw_grid_ajax'));
103 103
 	}
104 104
 
105 105
 	/**
@@ -113,28 +113,28 @@  discard block
 block discarded – undo
113 113
 	 *
114 114
 	 * @return array
115 115
 	 */
116
-	public function scripts( $min = '' ) {
116
+	public function scripts($min = '') {
117 117
 		return array(
118 118
 			'simcal-qtip' => array(
119
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/jquery.qtip' . $min . '.js',
120
-				'deps'      => array( 'jquery' ),
119
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/jquery.qtip'.$min.'.js',
120
+				'deps'      => array('jquery'),
121 121
 				'ver'       => '2.2.1',
122 122
 				'in_footer' => true,
123 123
 			),
124 124
 			'simcal-fullcal-moment' => array(
125
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment' . $min . '.js',
126
-				'deps'      => array( 'jquery' ),
125
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment'.$min.'.js',
126
+				'deps'      => array('jquery'),
127 127
 				'ver'       => '',
128 128
 				'in_footer' => true,
129 129
 			),
130 130
 			'simcal-moment-timezone' => array(
131
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/vendor/moment-timezone-with-data' . $min . '.js',
132
-				'deps'      => array( 'jquery' ),
131
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/vendor/moment-timezone-with-data'.$min.'.js',
132
+				'deps'      => array('jquery'),
133 133
 				'ver'       => '',
134 134
 				'in_footer' => true,
135 135
 			),
136 136
 			'simcal-default-calendar' => array(
137
-				'src'       => SIMPLE_CALENDAR_ASSETS . 'js/default-calendar' . $min . '.js',
137
+				'src'       => SIMPLE_CALENDAR_ASSETS.'js/default-calendar'.$min.'.js',
138 138
 				'deps'      => array(
139 139
 					'jquery',
140 140
 					'simcal-qtip',
@@ -161,15 +161,15 @@  discard block
 block discarded – undo
161 161
 	 *
162 162
 	 * @return array
163 163
 	 */
164
-	public function styles( $min = '' ) {
164
+	public function styles($min = '') {
165 165
 		return array(
166 166
 			'simcal-qtip' => array(
167
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/vendor/jquery.qtip' . $min . '.css',
167
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/vendor/jquery.qtip'.$min.'.css',
168 168
 				'ver'   => '2.2.1',
169 169
 				'media' => 'all',
170 170
 			),
171 171
 			'simcal-default-calendar-grid' => array(
172
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-grid' . $min . '.css',
172
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-grid'.$min.'.css',
173 173
 				'deps'  => array(
174 174
 					'simcal-qtip',
175 175
 				),
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 				'media' => 'all',
178 178
 			),
179 179
 			'simcal-default-calendar-list' => array(
180
-				'src'   => SIMPLE_CALENDAR_ASSETS . 'css/default-calendar-list' . $min . '.css',
180
+				'src'   => SIMPLE_CALENDAR_ASSETS.'css/default-calendar-list'.$min.'.css',
181 181
 				'deps'  => array(
182 182
 					'simcal-qtip',
183 183
 				),
@@ -196,22 +196,22 @@  discard block
 block discarded – undo
196 196
 
197 197
 		$calendar = $this->calendar;
198 198
 
199
-		if ( $calendar instanceof Default_Calendar ) {
199
+		if ($calendar instanceof Default_Calendar) {
200 200
 
201 201
 			?>
202 202
 
203
-			<?php edit_post_link( __( 'Edit Calendar', 'google-calendar-events' ), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id ); ?>
203
+			<?php edit_post_link(__('Edit Calendar', 'google-calendar-events'), '<p class="simcal-align-right"><small>', '</small></p>', $calendar->id); ?>
204 204
 
205 205
 			<table class="simcal-calendar-grid"
206 206
 			       data-event-bubble-trigger="<?php echo $calendar->event_bubble_trigger; ?>">
207 207
 				<thead class="simcal-calendar-head">
208 208
 					<tr>
209
-						<?php if ( ! $calendar->static ) { ?>
210
-							<th class="simcal-nav simcal-prev-wrapper" colspan="<?php echo apply_filters( 'simcal_prev_cols', '1' ); ?>">
211
-								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e( 'Previous Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-left"></i></button>
209
+						<?php if ( ! $calendar->static) { ?>
210
+							<th class="simcal-nav simcal-prev-wrapper" colspan="<?php echo apply_filters('simcal_prev_cols', '1'); ?>">
211
+								<button class="simcal-nav-button simcal-month-nav simcal-prev" title="<?php _e('Previous Month', 'google-calendar-events'); ?>"><i class="simcal-icon-left"></i></button>
212 212
 							</th>
213 213
 						<?php } ?>
214
-						<th colspan="<?php echo apply_filters( 'simcal_current_cols', $calendar->static ? '7' : '5' ); ?>"
214
+						<th colspan="<?php echo apply_filters('simcal_current_cols', $calendar->static ? '7' : '5'); ?>"
215 215
 						    class="simcal-nav simcal-current"
216 216
 						    data-calendar-current="<?php echo $calendar->start; ?>">
217 217
 							<?php
@@ -220,26 +220,26 @@  discard block
 block discarded – undo
220 220
 
221 221
 							// Display month and year according to user date format preference.
222 222
 
223
-							$year_pos  = strcspn( $calendar->date_format, 'Y y' );
224
-							$month_pos = strcspn( $calendar->date_format, 'F M m n' );
223
+							$year_pos  = strcspn($calendar->date_format, 'Y y');
224
+							$month_pos = strcspn($calendar->date_format, 'F M m n');
225 225
 
226
-							$current = array( 'month' => 'F', 'year' => 'Y' );
226
+							$current = array('month' => 'F', 'year' => 'Y');
227 227
 
228
-							if ( $year_pos < $month_pos ) {
229
-								$current = array_reverse( $current );
228
+							if ($year_pos < $month_pos) {
229
+								$current = array_reverse($current);
230 230
 							}
231 231
 
232
-							foreach ( $current as $k => $v ) {
233
-								echo ' <span class="simcal-current-' . $k , '">' . date_i18n( $v, $calendar->start ) . '</span> ';
232
+							foreach ($current as $k => $v) {
233
+								echo ' <span class="simcal-current-'.$k, '">'.date_i18n($v, $calendar->start).'</span> ';
234 234
 							}
235 235
 
236 236
 							echo '</h3>';
237 237
 
238 238
 							?>
239 239
 						</th>
240
-						<?php if ( ! $calendar->static ) { ?>
241
-							<th class="simcal-nav simcal-next-wrapper" colspan="<?php echo apply_filters( 'simcal_next_cols', '1' ); ?>">
242
-								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e( 'Next Month', 'google-calendar-events' ); ?>"><i class="simcal-icon-right"></i></button>
240
+						<?php if ( ! $calendar->static) { ?>
241
+							<th class="simcal-nav simcal-next-wrapper" colspan="<?php echo apply_filters('simcal_next_cols', '1'); ?>">
242
+								<button class="simcal-nav-button simcal-month-nav simcal-next" title="<?php _e('Next Month', 'google-calendar-events'); ?>"><i class="simcal-icon-right"></i></button>
243 243
 							</th>
244 244
 						<?php } ?>
245 245
 					</tr>
@@ -249,28 +249,28 @@  discard block
 block discarded – undo
249 249
 						// Print day names in short or long form for different viewport sizes.
250 250
 
251 251
 						$week_starts     = $calendar->week_starts;
252
-						$week_days_short = simcal_get_calendar_names_i18n( 'day', 'short' );
253
-						$week_days_full  = simcal_get_calendar_names_i18n( 'day', 'full' );
252
+						$week_days_short = simcal_get_calendar_names_i18n('day', 'short');
253
+						$week_days_full  = simcal_get_calendar_names_i18n('day', 'full');
254 254
 
255
-						for ( $i = $week_starts; $i <= 6; $i ++ ) :
255
+						for ($i = $week_starts; $i <= 6; $i++) :
256 256
 
257 257
 							?>
258 258
 							<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
259
-								data-screen-small="<?php echo mb_substr( $week_days_short[ $i ], 0, 1, 'UTF-8' ); ?>"
260
-							    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
261
-							    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
259
+								data-screen-small="<?php echo mb_substr($week_days_short[$i], 0, 1, 'UTF-8'); ?>"
260
+							    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
261
+							    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
262 262
 							<?php
263 263
 
264 264
 						endfor;
265 265
 
266
-						if ( $week_starts !== 0 ) :
267
-							for ( $i = 0; $i < $week_starts; $i ++ ) :
266
+						if ($week_starts !== 0) :
267
+							for ($i = 0; $i < $week_starts; $i++) :
268 268
 
269 269
 								?>
270 270
 								<th class="simcal-week-day simcal-week-day-<?php echo $i ?>"
271
-								    data-screen-small="<?php echo mb_substr( $week_days_short[ $i ], 0, 1, 'UTF-8' ); ?>"
272
-								    data-screen-medium="<?php echo $week_days_short[ $i ]; ?>"
273
-								    data-screen-large="<?php echo $week_days_full[ $i ]; ?>"><?php echo $week_days_short[ $i ]; ?></th>
271
+								    data-screen-small="<?php echo mb_substr($week_days_short[$i], 0, 1, 'UTF-8'); ?>"
272
+								    data-screen-medium="<?php echo $week_days_short[$i]; ?>"
273
+								    data-screen-large="<?php echo $week_days_full[$i]; ?>"><?php echo $week_days_short[$i]; ?></th>
274 274
 								<?php
275 275
 
276 276
 							endfor;
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 					</tr>
281 281
 				</thead>
282 282
 
283
-				<?php echo $this->draw_month( date( 'n', $calendar->start ), date( 'Y', $calendar->start ) ); ?>
283
+				<?php echo $this->draw_month(date('n', $calendar->start), date('Y', $calendar->start)); ?>
284 284
 
285 285
 			</table>
286 286
 
@@ -306,85 +306,85 @@  discard block
 block discarded – undo
306 306
 	 *
307 307
 	 * @return string
308 308
 	 */
309
-	private function draw_month( $month, $year, $id = 0 ) {
309
+	private function draw_month($month, $year, $id = 0) {
310 310
 
311 311
 		$calendar = $this->calendar;
312
-		if ( empty( $calendar ) ) {
313
-			$calendar = simcal_get_calendar( intval( $id ) );
314
-			if ( ! $calendar ) {
312
+		if (empty($calendar)) {
313
+			$calendar = simcal_get_calendar(intval($id));
314
+			if ( ! $calendar) {
315 315
 				return '';
316 316
 			}
317 317
 		}
318 318
 
319 319
 		$events = $calendar->events;
320 320
 
321
-		$feed          = simcal_get_feed( $calendar );
322
-		$feed_timezone = get_post_meta( $feed->post_id, '_feed_timezone', true );
321
+		$feed          = simcal_get_feed($calendar);
322
+		$feed_timezone = get_post_meta($feed->post_id, '_feed_timezone', true);
323 323
 
324 324
 		// Variables to cycle days in current month and find today in calendar.
325 325
 		$now         = $calendar->now;
326
-		$current     = Carbon::create( $year, $month, 1, 0, 0, 0, $calendar->timezone );
326
+		$current     = Carbon::create($year, $month, 1, 0, 0, 0, $calendar->timezone);
327 327
 		$current_min = $current->getTimestamp();
328 328
 		$current_max = $current->endOfDay()->getTimestamp();
329 329
 
330 330
 		// Calendar grid variables.
331 331
 		$week_starts   = $calendar->week_starts;
332
-		$week_of_year  = $current->weekOfYear;   // Relative count of the week number of the year.
333
-		$month_starts  = $current->dayOfWeek;    // Day upon which the month starts.
334
-		$days_in_month = $current->daysInMonth;  // Number of days in the given month.
332
+		$week_of_year  = $current->weekOfYear; // Relative count of the week number of the year.
333
+		$month_starts  = $current->dayOfWeek; // Day upon which the month starts.
334
+		$days_in_month = $current->daysInMonth; // Number of days in the given month.
335 335
 
336 336
 		// Set current month events timestamp boundaries.
337 337
 		$this->start = $current_min;
338 338
 		$this->end   = $current->endOfMonth()->timestamp;
339 339
 
340 340
 		// Get daily events for this month.
341
-		if ( $events && is_array( $events ) ) {
341
+		if ($events && is_array($events)) {
342 342
 
343 343
 			// Filter events within the boundaries previously set above.
344
-			$timestamps   = array_keys( $events );
345
-			$lower_bound  = array_filter( $timestamps, array( $this, 'filter_events_before' ) );
346
-			$higher_bound = array_filter( $lower_bound, array( $this, 'filter_events_after' ) );
347
-			$filtered     = ( is_array( $events ) && is_array( $higher_bound) ) && ! empty( $events ) && ! empty( $higher_bound ) ? array_intersect_key( $events, array_combine( $higher_bound, $higher_bound ) ) : array();
344
+			$timestamps   = array_keys($events);
345
+			$lower_bound  = array_filter($timestamps, array($this, 'filter_events_before'));
346
+			$higher_bound = array_filter($lower_bound, array($this, 'filter_events_after'));
347
+			$filtered     = (is_array($events) && is_array($higher_bound)) && ! empty($events) && ! empty($higher_bound) ? array_intersect_key($events, array_combine($higher_bound, $higher_bound)) : array();
348 348
 
349 349
 			// Put resulting events in an associative array, with day of the month as key for easy retrieval in calendar days loop.
350 350
 			$day_events = array();
351
-			foreach ( $filtered as $timestamp => $events_in_day ) {
352
-				foreach ( $events_in_day as $event ) {
353
-					if ( $event instanceof Event ){
354
-						$day = intval( Carbon::createFromTimestamp( $timestamp, $event->timezone )->endOfDay()->day );
355
-						$day_events[ $day ][] = $event;
351
+			foreach ($filtered as $timestamp => $events_in_day) {
352
+				foreach ($events_in_day as $event) {
353
+					if ($event instanceof Event) {
354
+						$day = intval(Carbon::createFromTimestamp($timestamp, $event->timezone)->endOfDay()->day);
355
+						$day_events[$day][] = $event;
356 356
 					}
357 357
 				}
358 358
 			}
359 359
 
360
-			ksort( $day_events, SORT_NUMERIC );
360
+			ksort($day_events, SORT_NUMERIC);
361 361
 		}
362 362
 
363 363
 		ob_start();
364 364
 
365
-		echo '<tbody class="simcal-month simcal-month-' . $month . '">' . "\n";
366
-		echo "\t" . '<tr class="simcal-week simcal-week-' . $week_of_year . '">';
365
+		echo '<tbody class="simcal-month simcal-month-'.$month.'">'."\n";
366
+		echo "\t".'<tr class="simcal-week simcal-week-'.$week_of_year.'">';
367 367
 
368 368
 		$days_in_row = 0;
369 369
 		// Week may start on an arbitrary day (sun, 0 - sat, 6).
370 370
 		$week_day = $week_starts;
371 371
 
372 372
 		// This fixes a possible bug when a month starts by Sunday (0).
373
-		if ( 0 !== $week_starts ) {
373
+		if (0 !== $week_starts) {
374 374
 			$b = $month_starts === 0 ? 7 : $month_starts;
375 375
 		} else {
376 376
 			$b = $month_starts;
377 377
 		}
378 378
 
379 379
 		// Void days in first week.
380
-		for ( $a = $week_starts; $a < $b; $a++ ) :
380
+		for ($a = $week_starts; $a < $b; $a++) :
381 381
 
382
-			$last_void_day_class = ( $a === ( $b - 1 ) ) ? 'simcal-day-void-last' : '';
382
+			$last_void_day_class = ($a === ($b - 1)) ? 'simcal-day-void-last' : '';
383 383
 
384
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
384
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
385 385
 
386 386
 			// Reset day of the week count (sun, 0 - sat, 6).
387
-			if ( $week_day === 6 ) {
387
+			if ($week_day === 6) {
388 388
 				$week_day = -1;
389 389
 			}
390 390
 			$week_day++;
@@ -394,103 +394,103 @@  discard block
 block discarded – undo
394 394
 		endfor;
395 395
 
396 396
 		// Actual days of the month.
397
-		for ( $day = 1; $day <= $days_in_month; $day++ ) :
397
+		for ($day = 1; $day <= $days_in_month; $day++) :
398 398
 
399 399
 			$count = 0;
400 400
 			$calendar_classes = array();
401
-			$day_classes = 'simcal-day-' . $day . ' simcal-weekday-' . $week_day;
401
+			$day_classes = 'simcal-day-'.$day.' simcal-weekday-'.$week_day;
402 402
 
403 403
 			$border_style = $bg_color = $color = '';
404 404
 
405 405
 			// Is this the present, the past or the future, Doc?
406
-			if ( $current_min <= $now && $current_max >= $now ) {
406
+			if ($current_min <= $now && $current_max >= $now) {
407 407
 				$day_classes .= ' simcal-today simcal-present simcal-day';
408
-				$the_color = new Color( $calendar->today_color );
409
-				$bg_color = '#' . $the_color->getHex();
408
+				$the_color = new Color($calendar->today_color);
409
+				$bg_color = '#'.$the_color->getHex();
410 410
 				$color = $the_color->isDark() ? '#ffffff' : '#000000';
411
-				$border_style = ' style="border: 1px solid ' . $bg_color . ';"';
412
-			} elseif ( $current_max < $now ) {
411
+				$border_style = ' style="border: 1px solid '.$bg_color.';"';
412
+			} elseif ($current_max < $now) {
413 413
 				$day_classes .= ' simcal-past simcal-day';
414
-			} elseif ( $current_min > $now ) {
414
+			} elseif ($current_min > $now) {
415 415
 				$day_classes .= ' simcal-future simcal-day';
416 416
 			}
417 417
 
418 418
 			// Print events for the current day in loop, if found any.
419
-			if ( isset( $day_events[ $day ] ) ) :
419
+			if (isset($day_events[$day])) :
420 420
 
421 421
 				$bullet_colors = array();
422 422
 
423 423
 				$list_events = '<ul class="simcal-events">';
424 424
 
425
-				foreach ( $day_events[ $day ] as $event ) :
425
+				foreach ($day_events[$day] as $event) :
426 426
 
427 427
 					$event_classes = $event_visibility = '';
428 428
 
429
-					if ( $event instanceof Event ) :
429
+					if ($event instanceof Event) :
430 430
 
431
-						if ( $feed->type == 'grouped-calendars' ) {
432
-							date_default_timezone_set( $feed_timezone );
431
+						if ($feed->type == 'grouped-calendars') {
432
+							date_default_timezone_set($feed_timezone);
433 433
 						} else {
434
-							date_default_timezone_set( $event->timezone );
434
+							date_default_timezone_set($event->timezone);
435 435
 						}
436 436
 
437 437
 						// Store the calendar id where the event belongs (useful in grouped calendar feeds)
438
-						$calendar_class  = 'simcal-events-calendar-' . strval( $event->calendar );
439
-						$calendar_classes[] = $calendar_class ;
438
+						$calendar_class = 'simcal-events-calendar-'.strval($event->calendar);
439
+						$calendar_classes[] = $calendar_class;
440 440
 
441 441
 						$recurring     = $event->recurrence ? 'simcal-event-recurring ' : '';
442 442
 						$has_location  = $event->venue ? 'simcal-event-has-location ' : '';
443 443
 
444
-						$event_classes  .= 'simcal-event ' . $recurring . $has_location . $calendar_class . ' simcal-tooltip';
444
+						$event_classes .= 'simcal-event '.$recurring.$has_location.$calendar_class.' simcal-tooltip';
445 445
 
446 446
 						// Toggle some events visibility if more than optional limit.
447
-						if ( ( $calendar->events_limit > -1 )  && ( $count >= $calendar->events_limit ) ) :
447
+						if (($calendar->events_limit > -1) && ($count >= $calendar->events_limit)) :
448 448
 							$event_classes    .= ' simcal-event-toggled';
449 449
 							$event_visibility  = ' style="display: none"';
450 450
 						endif;
451 451
 
452 452
 						// Event title in list.
453
-						$title = ! empty( $event->title ) ? trim( $event->title ) : __( 'Event', 'google-calendar-events' );
454
-						if ( $calendar->trim_titles >= 1 ) {
455
-							$title = strlen( $title ) > $calendar->trim_titles ? mb_substr( $title, 0, $calendar->trim_titles ) . '&hellip;' : $title;
453
+						$title = ! empty($event->title) ? trim($event->title) : __('Event', 'google-calendar-events');
454
+						if ($calendar->trim_titles >= 1) {
455
+							$title = strlen($title) > $calendar->trim_titles ? mb_substr($title, 0, $calendar->trim_titles).'&hellip;' : $title;
456 456
 						}
457 457
 
458 458
 						// Event color.
459 459
 						$bullet = '';
460 460
 						//$bullet_color = '#000';
461 461
 						$event_color = $event->get_color();
462
-						if ( ! empty( $event_color ) ) {
463
-							$bullet = '<span style="color: ' . $event_color . ';">&#9632;</span> ';
462
+						if ( ! empty($event_color)) {
463
+							$bullet = '<span style="color: '.$event_color.';">&#9632;</span> ';
464 464
 							$bullet_colors[] = $event_color;
465 465
 						} else {
466 466
 							$bullet_colors[] = '#000';
467 467
 						}
468 468
 
469 469
 						// Event contents.
470
-						$list_events .= "\t" . '<li class="' . $event_classes . '"' . $event_visibility . ' itemscope itemtype="http://schema.org/Event">' . "\n";
471
-						$list_events .= "\t\t" . '<span class="simcal-event-title">' . $bullet . $title . '</span>' . "\n";
472
-						$list_events .= "\t\t" . '<div class="simcal-event-details simcal-tooltip-content" style="display: none;">' . $calendar->get_event_html( $event ) . '</div>' . "\n";
473
-						$list_events .= "\t" . '</li>' . "\n";
470
+						$list_events .= "\t".'<li class="'.$event_classes.'"'.$event_visibility.' itemscope itemtype="http://schema.org/Event">'."\n";
471
+						$list_events .= "\t\t".'<span class="simcal-event-title">'.$bullet.$title.'</span>'."\n";
472
+						$list_events .= "\t\t".'<div class="simcal-event-details simcal-tooltip-content" style="display: none;">'.$calendar->get_event_html($event).'</div>'."\n";
473
+						$list_events .= "\t".'</li>'."\n";
474 474
 
475
-						$count ++;
475
+						$count++;
476 476
 
477 477
 					endif;
478 478
 
479 479
 				endforeach;
480 480
 
481
-				if ( ( $current_min <= $now ) && ( $current_max >= $now ) ) {
481
+				if (($current_min <= $now) && ($current_max >= $now)) {
482 482
 					$day_classes .= ' simcal-today-has-events';
483 483
 				}
484
-				$day_classes .= ' simcal-day-has-events simcal-day-has-' . strval( $count ) . '-events';
484
+				$day_classes .= ' simcal-day-has-events simcal-day-has-'.strval($count).'-events';
485 485
 
486
-				if ( $calendar_classes ) {
487
-					$day_classes .= ' ' . trim( implode( ' ', array_unique( $calendar_classes ) ) );
486
+				if ($calendar_classes) {
487
+					$day_classes .= ' '.trim(implode(' ', array_unique($calendar_classes)));
488 488
 				}
489 489
 
490
-				$list_events .= '</ul>' . "\n";
490
+				$list_events .= '</ul>'."\n";
491 491
 
492 492
 				// Optional button to toggle hidden events in list.
493
-				if ( ( $calendar->events_limit > -1 ) && ( $count > $calendar->events_limit ) ) :
493
+				if (($calendar->events_limit > -1) && ($count > $calendar->events_limit)) :
494 494
 					$list_events .= '<button class="simcal-events-toggle"><i class="simcal-icon-down simcal-icon-animate"></i></button>';
495 495
 				endif;
496 496
 
@@ -502,49 +502,49 @@  discard block
 block discarded – undo
502 502
 			endif;
503 503
 
504 504
 			// The actual days with numbers and events in each row cell.
505
-			echo '<td class="' . $day_classes . '" data-events-count="' . strval( $count ) . '">' . "\n";
506
-
507
-			if ( $color ) {
508
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
509
-			} elseif ( $count > 0 ) {
510
-				$the_color = new Color( $calendar->days_events_color );
511
-				$color = ! $color ? ( $the_color->isDark() ? '#ffffff' : '#000000' ) : $color;
512
-				$bg_color = ! $bg_color ? '#' . $the_color->getHex() : $bg_color;
513
-				$day_style = ' style="background-color: ' . $bg_color . '; color: ' . $color .'"';
505
+			echo '<td class="'.$day_classes.'" data-events-count="'.strval($count).'">'."\n";
506
+
507
+			if ($color) {
508
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
509
+			} elseif ($count > 0) {
510
+				$the_color = new Color($calendar->days_events_color);
511
+				$color = ! $color ? ($the_color->isDark() ? '#ffffff' : '#000000') : $color;
512
+				$bg_color = ! $bg_color ? '#'.$the_color->getHex() : $bg_color;
513
+				$day_style = ' style="background-color: '.$bg_color.'; color: '.$color.'"';
514 514
 			} else {
515 515
 				$day_style = '';
516 516
 			}
517 517
 
518
-			echo "\t" . '<div' . $border_style . '>' . "\n";
519
-			echo "\t\t" . '<span class="simcal-day-label simcal-day-number"' . $day_style . '>' . $day . '</span>' . "\n";
520
-			echo "\t\t" . $list_events . "\n";
518
+			echo "\t".'<div'.$border_style.'>'."\n";
519
+			echo "\t\t".'<span class="simcal-day-label simcal-day-number"'.$day_style.'>'.$day.'</span>'."\n";
520
+			echo "\t\t".$list_events."\n";
521 521
 			echo "\t\t";
522 522
 			echo '<span class="simcal-events-dots" style="display: none;">';
523 523
 
524 524
 			// Event bullets for calendar mobile mode.
525
-			for( $i = 0; $i < $count; $i++ ) {
526
-				echo '<b style="color: ' . $bullet_colors[ $i ] . ';"> &bull; </b>';
525
+			for ($i = 0; $i < $count; $i++) {
526
+				echo '<b style="color: '.$bullet_colors[$i].';"> &bull; </b>';
527 527
 			}
528 528
 
529
-			echo '</span>' . "\n";
530
-			echo "\t" . '</div>' . "\n";
531
-			echo '</td>' . "\n";
529
+			echo '</span>'."\n";
530
+			echo "\t".'</div>'."\n";
531
+			echo '</td>'."\n";
532 532
 
533 533
 			// Reset day of the week count (sun, 0 - sat, 6).
534
-			if ( $week_day === 6 ) {
534
+			if ($week_day === 6) {
535 535
 				$week_day = - 1;
536 536
 			}
537 537
 			$week_day++;
538 538
 
539 539
 			// Reset count of days for this row (0-6).
540
-			if ( $days_in_row === 6 ) :
540
+			if ($days_in_row === 6) :
541 541
 
542 542
 				// Close the week row.
543 543
 				echo '</tr>';
544 544
 
545 545
 				// Open a new week row.
546
-				if ( $day < $days_in_month ) {
547
-					echo '<tr class="simcal-week simcal-week-' . $week_of_year++ . '">' . "\n";
546
+				if ($day < $days_in_month) {
547
+					echo '<tr class="simcal-week simcal-week-'.$week_of_year++.'">'."\n";
548 548
 				}
549 549
 
550 550
 				$days_in_row = -1;
@@ -553,27 +553,27 @@  discard block
 block discarded – undo
553 553
 
554 554
 			$days_in_row++;
555 555
 
556
-			$current_min = Carbon::createFromTimestamp( $current_min, $calendar->timezone )->addDay()->getTimestamp();
557
-			$current_max = Carbon::createFromTimestamp( $current_max, $calendar->timezone )->addDay()->getTimestamp();
556
+			$current_min = Carbon::createFromTimestamp($current_min, $calendar->timezone)->addDay()->getTimestamp();
557
+			$current_max = Carbon::createFromTimestamp($current_max, $calendar->timezone)->addDay()->getTimestamp();
558 558
 
559 559
 		endfor;
560 560
 
561 561
 		// Void days at the end of the month.
562
-		$remainder_days = ( 6 - $days_in_row );
562
+		$remainder_days = (6 - $days_in_row);
563 563
 
564
-		for ( $i = 0; $i <= $remainder_days; $i ++ ) {
564
+		for ($i = 0; $i <= $remainder_days; $i++) {
565 565
 
566
-			$last_void_day_class = ( $i == $remainder_days ) ? 'simcal-day-void-last' : '';
566
+			$last_void_day_class = ($i == $remainder_days) ? 'simcal-day-void-last' : '';
567 567
 
568
-			echo '<td class="simcal-day simcal-day-void ' . $last_void_day_class . '"></td>' . "\n";
568
+			echo '<td class="simcal-day simcal-day-void '.$last_void_day_class.'"></td>'."\n";
569 569
 
570 570
 			$week_day++;
571 571
 		}
572 572
 
573
-		echo "\t" . '</tr>' . "\n";
574
-		echo '</tbody>' . "\n";
573
+		echo "\t".'</tr>'."\n";
574
+		echo '</tbody>'."\n";
575 575
 
576
-		date_default_timezone_set( $calendar->site_timezone );
576
+		date_default_timezone_set($calendar->site_timezone);
577 577
 
578 578
 		return ob_get_clean();
579 579
 	}
@@ -585,17 +585,17 @@  discard block
 block discarded – undo
585 585
 	 */
586 586
 	public function draw_grid_ajax() {
587 587
 
588
-		if ( isset( $_POST['month'] ) && isset( $_POST['year'] ) && isset( $_POST['id'] ) ) {
588
+		if (isset($_POST['month']) && isset($_POST['year']) && isset($_POST['id'])) {
589 589
 
590
-			$month = absint( $_POST['month'] );
591
-			$year  = absint( $_POST['year'] );
592
-			$id    = absint( $_POST['id'] );
590
+			$month = absint($_POST['month']);
591
+			$year  = absint($_POST['year']);
592
+			$id    = absint($_POST['id']);
593 593
 
594
-			wp_send_json_success( $this->draw_month( $month, $year, $id ) );
594
+			wp_send_json_success($this->draw_month($month, $year, $id));
595 595
 
596 596
 		} else {
597 597
 
598
-			wp_send_json_error( 'Missing arguments in default calendar grid ajax request.' );
598
+			wp_send_json_error('Missing arguments in default calendar grid ajax request.');
599 599
 
600 600
 		}
601 601
 
@@ -611,8 +611,8 @@  discard block
 block discarded – undo
611 611
 	 *
612 612
 	 * @return bool
613 613
 	 */
614
-	private function filter_events_before( $event ) {
615
-		return intval( $event ) >= intval( $this->start );
614
+	private function filter_events_before($event) {
615
+		return intval($event) >= intval($this->start);
616 616
 	}
617 617
 
618 618
 	/**
@@ -625,8 +625,8 @@  discard block
 block discarded – undo
625 625
 	 *
626 626
 	 * @return bool
627 627
 	 */
628
-	private function filter_events_after( $event ) {
629
-		return intval( $event ) < intval( $this->end );
628
+	private function filter_events_after($event) {
629
+		return intval($event) < intval($this->end);
630 630
 	}
631 631
 
632 632
 }
Please login to merge, or discard this patch.
includes/admin/pages/calendars.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use SimpleCalendar\Abstracts\Calendar;
10 10
 use SimpleCalendar\Abstracts\Admin_Page;
11 11
 
12
-if ( ! defined( 'ABSPATH' ) ) {
12
+if ( ! defined('ABSPATH')) {
13 13
 	exit;
14 14
 }
15 15
 
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$this->id               = 'calendars';
41 41
 		$this->option_group     = 'settings';
42
-		$this->label            = __( 'Calendars', 'google-calendar-events' );
42
+		$this->label            = __('Calendars', 'google-calendar-events');
43 43
 		//$this->description      = __( 'Manage calendar preferences and calendar types settings and options.', 'google-calendar-events' );
44 44
 
45 45
 		$calendars = simcal_get_calendar_types();
46 46
 		$calendar_settings = array();
47
-		if ( ! empty( $calendars ) && is_array( $calendars ) ) {
48
-			foreach ( $calendars as $calendar => $views ) {
47
+		if ( ! empty($calendars) && is_array($calendars)) {
48
+			foreach ($calendars as $calendar => $views) {
49 49
 
50
-				$calendar_type = simcal_get_calendar( $calendar );
50
+				$calendar_type = simcal_get_calendar($calendar);
51 51
 
52
-				if ( $calendar_type instanceof Calendar ) {
52
+				if ($calendar_type instanceof Calendar) {
53 53
 					$settings = $calendar_type->settings_fields();
54
-					if ( ! empty( $settings ) ) {
55
-						$calendar_settings[ $calendar ] = $settings;
54
+					if ( ! empty($settings)) {
55
+						$calendar_settings[$calendar] = $settings;
56 56
 					}
57 57
 				}
58 58
 			}
@@ -74,17 +74,17 @@  discard block
 block discarded – undo
74 74
 
75 75
 		$sections = array(
76 76
 			'general' => array(
77
-				'title'       => __( 'General', 'google-calendar-events' ),
77
+				'title'       => __('General', 'google-calendar-events'),
78 78
 				'description' => '',
79 79
 			),
80 80
 		);
81 81
 
82 82
 		$calendar_types = $this->calendar_types;
83 83
 
84
-		if ( ! empty( $calendar_types ) && is_array( $calendar_types ) ) {
85
-			foreach ( $calendar_types as $calendar_type => $type ) {
84
+		if ( ! empty($calendar_types) && is_array($calendar_types)) {
85
+			foreach ($calendar_types as $calendar_type => $type) {
86 86
 
87
-				$sections[ $calendar_type ] = array(
87
+				$sections[$calendar_type] = array(
88 88
 					'title' => $type['name'],
89 89
 					'description' => $type['description'],
90 90
 				);
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 			}
93 93
 		}
94 94
 
95
-		arsort( $calendar_types );
95
+		arsort($calendar_types);
96 96
 
97
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
97
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_sections', $sections);
98 98
 	}
99 99
 
100 100
 	/**
@@ -108,11 +108,11 @@  discard block
 block discarded – undo
108 108
 
109 109
 		$fields       = array();
110 110
 		$feed_types   = $this->calendar_types;
111
-		$this->values = get_option( 'simple-calendar_' . $this->option_group . '_' . $this->id );
111
+		$this->values = get_option('simple-calendar_'.$this->option_group.'_'.$this->id);
112 112
 
113
-		foreach ( $this->sections as $section => $contents ) :
113
+		foreach ($this->sections as $section => $contents) :
114 114
 
115
-			if ( 'general' == $section ) {
115
+			if ('general' == $section) {
116 116
 
117 117
 				$options    = array();
118 118
 				$post_types = get_post_types(
@@ -124,36 +124,36 @@  discard block
 block discarded – undo
124 124
 					'objects',
125 125
 					'not'
126 126
 				);
127
-				unset( $post_types['attachment'] );
128
-				unset( $post_types['calendar'] );
129
-				unset( $post_types['gce_feed'] );
130
-				foreach ( $post_types as $slug => $post_type ) {
131
-					$options[ $slug ] = $post_type->label;
127
+				unset($post_types['attachment']);
128
+				unset($post_types['calendar']);
129
+				unset($post_types['gce_feed']);
130
+				foreach ($post_types as $slug => $post_type) {
131
+					$options[$slug] = $post_type->label;
132 132
 				}
133
-				asort( $options );
133
+				asort($options);
134 134
 
135
-				$fields[ $section ][] = array(
135
+				$fields[$section][] = array(
136 136
 					'type'        => 'select',
137 137
 					'multiselect' => 'multiselect',
138 138
 					'enhanced'    => 'enhanced',
139
-					'title'       => __( 'Attach Calendars', 'google-calendar-events' ),
140
-					'tooltip'     => __( 'You can choose on which content types to add the ability to attach calendars.', 'google-calendar-events' ),
141
-					'name'        => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][attach_calendars_posts]',
142
-					'id'          => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-attach-calendars-posts',
143
-					'value'       => $this->get_option_value( $section, 'attach_calendars_posts' ),
139
+					'title'       => __('Attach Calendars', 'google-calendar-events'),
140
+					'tooltip'     => __('You can choose on which content types to add the ability to attach calendars.', 'google-calendar-events'),
141
+					'name'        => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.'][attach_calendars_posts]',
142
+					'id'          => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-attach-calendars-posts',
143
+					'value'       => $this->get_option_value($section, 'attach_calendars_posts'),
144 144
 					'default'     => 'post,page',
145 145
 					'options'     => $options,
146 146
 				);
147 147
 
148
-			} elseif ( isset( $feed_types[ $section ]['fields'] ) ) {
148
+			} elseif (isset($feed_types[$section]['fields'])) {
149 149
 
150
-				foreach ( $feed_types[ $section ]['fields'] as $key => $args ) {
150
+				foreach ($feed_types[$section]['fields'] as $key => $args) {
151 151
 
152
-					$fields[ $section ][] = array_merge( $args, array(
153
-						'name'  => 'simple-calendar_' . $this->option_group . '_' . $this->id . '[' . $section . '][' . $key . ']',
154
-						'id'    => 'simple-calendar-' . $this->option_group . '-' . $this->id . '-' . $key,
155
-						'value' => $this->get_option_value( $section, $key )
156
-					) );
152
+					$fields[$section][] = array_merge($args, array(
153
+						'name'  => 'simple-calendar_'.$this->option_group.'_'.$this->id.'['.$section.']['.$key.']',
154
+						'id'    => 'simple-calendar-'.$this->option_group.'-'.$this->id.'-'.$key,
155
+						'value' => $this->get_option_value($section, $key)
156
+					));
157 157
 
158 158
 				}
159 159
 
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 		endforeach;
163 163
 
164
-		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id . '_fields', $fields );
164
+		return apply_filters('simcal_add_'.$this->option_group.'_'.$this->id.'_fields', $fields);
165 165
 	}
166 166
 
167 167
 }
Please login to merge, or discard this patch.
includes/admin/welcome.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  */
9 9
 namespace SimpleCalendar\Admin;
10 10
 
11
-if ( ! defined( 'ABSPATH' ) ) {
11
+if ( ! defined('ABSPATH')) {
12 12
 	exit;
13 13
 }
14 14
 
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public function __construct() {
38 38
 
39
-		$this->install = isset( $_GET['simcal_install'] ) ? esc_attr( $_GET['simcal_install'] ) : '';
39
+		$this->install = isset($_GET['simcal_install']) ? esc_attr($_GET['simcal_install']) : '';
40 40
 
41
-		add_action( 'admin_menu', array( $this, 'welcome_page_tabs' ) );
42
-		add_action( 'admin_head', array( $this, 'remove_submenu_pages' ) );
41
+		add_action('admin_menu', array($this, 'welcome_page_tabs'));
42
+		add_action('admin_head', array($this, 'remove_submenu_pages'));
43 43
 	}
44 44
 
45 45
 	/**
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function welcome_page_tabs() {
51 51
 
52
-		$welcome_page_name  = __( 'About Simple Calendar', 'google-calendar-events' );
53
-		$welcome_page_title = __( 'Welcome to Simple Calendar', 'google-calendar-events' );
52
+		$welcome_page_name  = __('About Simple Calendar', 'google-calendar-events');
53
+		$welcome_page_title = __('Welcome to Simple Calendar', 'google-calendar-events');
54 54
 
55
-		$page = isset( $_GET['page'] ) ? $_GET['page'] : 'simple-calendar_about';
55
+		$page = isset($_GET['page']) ? $_GET['page'] : 'simple-calendar_about';
56 56
 
57
-		switch ( $page ) {
57
+		switch ($page) {
58 58
 
59 59
 			case 'simple-calendar_about' :
60 60
 				$page = add_dashboard_page(
@@ -62,9 +62,9 @@  discard block
 block discarded – undo
62 62
 					$welcome_page_name,
63 63
 					'manage_options',
64 64
 					'simple-calendar_about',
65
-					array( $this, 'about_screen' )
65
+					array($this, 'about_screen')
66 66
 				);
67
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
67
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
68 68
 				break;
69 69
 
70 70
 			case 'simple-calendar_credits' :
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
 					$welcome_page_name,
74 74
 					'manage_options',
75 75
 					'simple-calendar_credits',
76
-					array( $this, 'credits_screen' )
76
+					array($this, 'credits_screen')
77 77
 				);
78
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
78
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
79 79
 				break;
80 80
 
81 81
 			case 'simple-calendar_translators' :
@@ -84,9 +84,9 @@  discard block
 block discarded – undo
84 84
 					$welcome_page_name,
85 85
 					'manage_options',
86 86
 					'simple-calendar_translators',
87
-					array( $this, 'translators_screen' )
87
+					array($this, 'translators_screen')
88 88
 				);
89
-				add_action( 'admin_print_styles-' . $page, array( $this, 'styles' ) );
89
+				add_action('admin_print_styles-'.$page, array($this, 'styles'));
90 90
 				break;
91 91
 		}
92 92
 
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 	 * @since 3.0.0
99 99
 	 */
100 100
 	public function remove_submenu_pages() {
101
-		remove_submenu_page( 'index.php', 'simple-calendar_about' );
102
-		remove_submenu_page( 'index.php', 'simple-calendar_credits' );
103
-		remove_submenu_page( 'index.php', 'simple-calendar_translators' );
101
+		remove_submenu_page('index.php', 'simple-calendar_about');
102
+		remove_submenu_page('index.php', 'simple-calendar_credits');
103
+		remove_submenu_page('index.php', 'simple-calendar_translators');
104 104
 	}
105 105
 
106 106
 	/**
@@ -129,18 +129,18 @@  discard block
 block discarded – undo
129 129
 
130 130
 		?>
131 131
 		<p>
132
-			<a href="<?php echo admin_url( 'edit.php?post_type=calendar' ); ?>"
132
+			<a href="<?php echo admin_url('edit.php?post_type=calendar'); ?>"
133 133
 			   class="button button-primary"
134
-				><?php _e( 'Calendars', 'google-calendar-events' ); ?></a>
135
-			<a href="<?php echo esc_url( add_query_arg( 'page', 'simple-calendar_settings', admin_url( 'admin.php' ) ) ); ?>"
134
+				><?php _e('Calendars', 'google-calendar-events'); ?></a>
135
+			<a href="<?php echo esc_url(add_query_arg('page', 'simple-calendar_settings', admin_url('admin.php'))); ?>"
136 136
 			   class="button button-primary"
137
-				><?php _e( 'Settings', 'google-calendar-events' ); ?></a>
138
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' ); ?>"
137
+				><?php _e('Settings', 'google-calendar-events'); ?></a>
138
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page'); ?>"
139 139
 			   class="docs button button-primary" target="_blank"
140
-				><?php _e( 'Add-ons', 'google-calendar-events' ); ?></a>
141
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
140
+				><?php _e('Add-ons', 'google-calendar-events'); ?></a>
141
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
142 142
 			   class="docs button button-primary" target="_blank"
143
-				><?php _e( 'Documentation', 'google-calendar-events' ); ?></a>
143
+				><?php _e('Documentation', 'google-calendar-events'); ?></a>
144 144
 		</p>
145 145
 		<?php
146 146
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		<h1>
158 158
 			<?php
159 159
 			/* translators: %s prints the current version of the plugin. */
160
-			printf( __( 'Welcome to Simple Calendar %s', 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
160
+			printf(__('Welcome to Simple Calendar %s', 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
161 161
 			?>
162 162
 		</h1>
163 163
 
@@ -165,21 +165,21 @@  discard block
 block discarded – undo
165 165
 			<?php
166 166
 
167 167
 			// Difference message if updating vs fresh install.
168
-			if ( 'update' == $this->install ) {
169
-				$message = __( 'Thanks for updating to the latest version!', 'google-calendar-events' );
168
+			if ('update' == $this->install) {
169
+				$message = __('Thanks for updating to the latest version!', 'google-calendar-events');
170 170
 			} else {
171
-				$message = __( 'Thanks for installing!', 'google-calendar-events' );
171
+				$message = __('Thanks for installing!', 'google-calendar-events');
172 172
 			}
173 173
 
174 174
 			echo $message;
175 175
 
176 176
 			/* translators: %s prints the current version of the plugin. */
177
-			printf( ' ' . __( "Simple Calendar %s has a few display options to configure. ", 'google-calendar-events' ), SIMPLE_CALENDAR_VERSION );
177
+			printf(' '.__("Simple Calendar %s has a few display options to configure. ", 'google-calendar-events'), SIMPLE_CALENDAR_VERSION);
178 178
 			?>
179
-			<a href="<?php echo simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'welcome-page' ); ?>"
179
+			<a href="<?php echo simcal_ga_campaign_url(simcal_get_url('docs'), 'core-plugin', 'welcome-page'); ?>"
180 180
 			   target="_blank"
181
-			><?php _e( 'Check out our documentation', 'google-calendar-events' ); ?></a>
182
-			<?php _e( 'to get started now.', 'google-calendar-events' ); ?>
181
+			><?php _e('Check out our documentation', 'google-calendar-events'); ?></a>
182
+			<?php _e('to get started now.', 'google-calendar-events'); ?>
183 183
 		</div>
184 184
 
185 185
 		<div class="simcal-badge">&nbsp;</div>
@@ -187,21 +187,21 @@  discard block
 block discarded – undo
187 187
 		<?php $this->main_nav_links(); ?>
188 188
 
189 189
 		<h2 class="nav-tab-wrapper">
190
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_about' ) {
190
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_about') {
191 191
 				echo 'nav-tab-active';
192 192
 			} ?>"
193
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_about' ), 'index.php' ) ) ); ?>"
194
-				><?php _e( "What's New", 'google-calendar-events' ); ?></a>
195
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_credits' ) {
193
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_about'), 'index.php'))); ?>"
194
+				><?php _e("What's New", 'google-calendar-events'); ?></a>
195
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_credits') {
196 196
 				echo 'nav-tab-active';
197 197
 			} ?>"
198
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_credits' ), 'index.php' ) ) ); ?>"
199
-				><?php _e( 'Credits', 'google-calendar-events' ); ?></a>
200
-			<a class="nav-tab <?php if ( $_GET['page'] == 'simple-calendar_translators' ) {
198
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_credits'), 'index.php'))); ?>"
199
+				><?php _e('Credits', 'google-calendar-events'); ?></a>
200
+			<a class="nav-tab <?php if ($_GET['page'] == 'simple-calendar_translators') {
201 201
 				echo 'nav-tab-active';
202 202
 			} ?>"
203
-			   href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'simple-calendar_translators' ), 'index.php' ) ) ); ?>"
204
-				><?php _e( 'Translators', 'google-calendar-events' ); ?></a>
203
+			   href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'simple-calendar_translators'), 'index.php'))); ?>"
204
+				><?php _e('Translators', 'google-calendar-events'); ?></a>
205 205
 		</h2>
206 206
 		<?php
207 207
 
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
 	 * @since 3.0.0
214 214
 	 */
215 215
 	public function about_screen() {
216
-		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS . '/images/welcome';
217
-		$welcome_addons_link = simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'welcome-page' );
216
+		$welcome_image_about_path = SIMPLE_CALENDAR_ASSETS.'/images/welcome';
217
+		$welcome_addons_link = simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'welcome-page');
218 218
 
219 219
 		?>
220 220
 		<div id="simcal-welcome">
@@ -222,20 +222,20 @@  discard block
 block discarded – undo
222 222
 
223 223
 				<?php $this->intro(); ?>
224 224
 
225
-				<h3><?php _e( 'Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events' ); ?></h3>
226
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-basic.png'; ?>" />
225
+				<h3><?php _e('Configure event colors, number of events to display, grid or list style and more.', 'google-calendar-events'); ?></h3>
226
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-basic.png'; ?>" />
227 227
 
228
-				<h3><?php _e( 'Mobile responsive and widget ready.', 'google-calendar-events' ); ?></h3>
229
-				<img src="<?php echo $welcome_image_about_path . '/list-view-widget.png'; ?>" />
230
-				<img src="<?php echo $welcome_image_about_path . '/grid-view-widget-dark-theme.png'; ?>" />
228
+				<h3><?php _e('Mobile responsive and widget ready.', 'google-calendar-events'); ?></h3>
229
+				<img src="<?php echo $welcome_image_about_path.'/list-view-widget.png'; ?>" />
230
+				<img src="<?php echo $welcome_image_about_path.'/grid-view-widget-dark-theme.png'; ?>" />
231 231
 
232 232
 				<h3>
233
-					<?php _e( 'Add even more display options with add-ons like', 'google-calendar-events' ); ?>
234
-					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'FullCalendar and Google Calendar Pro', 'google-calendar-events' ); ?></a>.
233
+					<?php _e('Add even more display options with add-ons like', 'google-calendar-events'); ?>
234
+					<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('FullCalendar and Google Calendar Pro', 'google-calendar-events'); ?></a>.
235 235
 				</h3>
236
-				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path . '/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
236
+				<a href="<?php echo $welcome_addons_link; ?>" target="_blank"><img src="<?php echo $welcome_image_about_path.'/fullcalendar-google-calendar-pro-grid-view.png'; ?>" /></a>
237 237
 
238
-				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e( 'View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events' ); ?></a></h3>
238
+				<h3><a href="<?php echo $welcome_addons_link; ?>" target="_blank"><?php _e('View Pricing and Try a Demo of our Simple Calendar Pro Add-ons.', 'google-calendar-events'); ?></a></h3>
239 239
 
240 240
 				<hr/>
241 241
 
@@ -262,8 +262,8 @@  discard block
 block discarded – undo
262 262
 					<?php
263 263
 
264 264
 					printf(
265
-						__( "Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events' ),
266
-						simcal_get_url( 'github' )
265
+						__("Simple Calendar is created by a worldwide team of developers. If you'd like to contribute please visit our <a href='%s' target='_blank'>GitHub repo</a>.", 'google-calendar-events'),
266
+						simcal_get_url('github')
267 267
 					);
268 268
 
269 269
 					?>
@@ -287,10 +287,10 @@  discard block
 block discarded – undo
287 287
 			<div class="wrap about-wrap translators-wrap">
288 288
 				<?php $this->intro(); ?>
289 289
 				<p class="about-description">
290
-					<?php _e( 'Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events' ); ?>
290
+					<?php _e('Simple Calendar has been kindly translated into several other languages by contributors from all over the world.', 'google-calendar-events'); ?>
291 291
 				</p>
292 292
 				<p class="about-description">
293
-					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e( 'Click here to help translate', 'google-calendar-events' ); ?></a>
293
+					<a href="https://translate.wordpress.org/projects/wp-plugins/google-calendar-events" target="_blank"><?php _e('Click here to help translate', 'google-calendar-events'); ?></a>
294 294
 				</p>
295 295
 				<?php
296 296
 
@@ -319,31 +319,31 @@  discard block
 block discarded – undo
319 319
 
320 320
 		$contributors = $this->get_contributors();
321 321
 
322
-		if ( empty( $contributors ) ) {
322
+		if (empty($contributors)) {
323 323
 			return '';
324 324
 		}
325 325
 
326 326
 		$contributor_list = '<ul class="wp-people-group">';
327 327
 
328
-		foreach ( $contributors as $contributor ) {
328
+		foreach ($contributors as $contributor) {
329 329
 
330 330
 			// Skip contributor bots
331
-			$contributor_bots = array( 'gitter-badger' );
332
-			if ( in_array( $contributor->login, $contributor_bots ) ) {
331
+			$contributor_bots = array('gitter-badger');
332
+			if (in_array($contributor->login, $contributor_bots)) {
333 333
 				continue;
334 334
 			}
335 335
 
336 336
 			$contributor_list .= '<li class="wp-person">';
337 337
 			$contributor_list .= sprintf(
338 338
 				'<a href="%s" title="%s" target="_blank">%s</a>',
339
-				esc_url( 'https://github.com/' . $contributor->login ),
340
-				esc_html( sprintf( __( 'View %s', 'google-calendar-events' ), $contributor->login ) ),
341
-				sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) )
339
+				esc_url('https://github.com/'.$contributor->login),
340
+				esc_html(sprintf(__('View %s', 'google-calendar-events'), $contributor->login)),
341
+				sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login))
342 342
 			);
343 343
 			$contributor_list .= sprintf(
344 344
 				'<a class="web" href="%s" target="_blank">%s</a>',
345
-				esc_url( 'https://github.com/' . $contributor->login ),
346
-				esc_html( $contributor->login )
345
+				esc_url('https://github.com/'.$contributor->login),
346
+				esc_html($contributor->login)
347 347
 			);
348 348
 			$contributor_list .= '</li>';
349 349
 
@@ -363,24 +363,24 @@  discard block
 block discarded – undo
363 363
 	 */
364 364
 	public function get_contributors() {
365 365
 
366
-		$contributors = get_transient( '_simple-calendar_contributors' );
367
-		if ( false !== $contributors ) {
366
+		$contributors = get_transient('_simple-calendar_contributors');
367
+		if (false !== $contributors) {
368 368
 			return $contributors;
369 369
 		}
370 370
 
371 371
 		$response = wp_safe_remote_get(
372 372
 			'https://api.github.com/repos/moonstonemedia/Simple-Calendar/contributors'
373 373
 		);
374
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
374
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
375 375
 			return array();
376 376
 		}
377 377
 
378
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
379
-		if ( ! is_array( $contributors ) ) {
378
+		$contributors = json_decode(wp_remote_retrieve_body($response));
379
+		if ( ! is_array($contributors)) {
380 380
 			return array();
381 381
 		}
382 382
 
383
-		set_transient( '_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS );
383
+		set_transient('_simple-calendar_contributors', $contributors, HOUR_IN_SECONDS);
384 384
 
385 385
 		return $contributors;
386 386
 	}
Please login to merge, or discard this patch.
includes/abstracts/calendar.php 1 patch
Spacing   +172 added lines, -172 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 use SimpleCalendar\Events\Event_Builder;
12 12
 use SimpleCalendar\Events\Events;
13 13
 
14
-if ( ! defined( 'ABSPATH' ) ) {
14
+if ( ! defined('ABSPATH')) {
15 15
 	exit;
16 16
 }
17 17
 
@@ -234,12 +234,12 @@  discard block
 block discarded – undo
234 234
 	 * @param int|object|\WP_Post|Calendar $calendar
235 235
 	 * @param string $view
236 236
 	 */
237
-	public function __construct( $calendar, $view = '' ) {
237
+	public function __construct($calendar, $view = '') {
238 238
 
239 239
 		// Set the post object.
240
-		$this->set_post_object( $calendar );
240
+		$this->set_post_object($calendar);
241 241
 
242
-		if ( ! is_null( $this->post ) ) {
242
+		if ( ! is_null($this->post)) {
243 243
 
244 244
 			// Set calendar type and events source.
245 245
 			$this->set_taxonomies();
@@ -256,23 +256,23 @@  discard block
 block discarded – undo
256 256
 			$this->set_events_template();
257 257
 
258 258
 			// Get events source data.
259
-			$feed = simcal_get_feed( $this );
260
-			if ( $feed instanceof Feed ) {
261
-				if ( ! empty( $feed->events ) ) {
262
-					if ( is_array( $feed->events ) ) {
263
-						$this->set_events( $feed->events );
264
-						if ( 'use_calendar' == get_post_meta( $this->id, '_feed_timezone_setting', true ) ) {
259
+			$feed = simcal_get_feed($this);
260
+			if ($feed instanceof Feed) {
261
+				if ( ! empty($feed->events)) {
262
+					if (is_array($feed->events)) {
263
+						$this->set_events($feed->events);
264
+						if ('use_calendar' == get_post_meta($this->id, '_feed_timezone_setting', true)) {
265 265
 							$this->timezone = $feed->timezone;
266 266
 							$this->set_start();
267 267
 						}
268
-					} elseif ( is_string( $feed->events ) ) {
268
+					} elseif (is_string($feed->events)) {
269 269
 						$this->errors[] = $feed->events;
270 270
 					}
271 271
 				}
272 272
 			}
273 273
 
274 274
 			// Set general purpose timestamps.
275
-			$now = Carbon::now( $this->timezone );
275
+			$now = Carbon::now($this->timezone);
276 276
 			$this->now    = $now->getTimestamp();
277 277
 			$this->today  = $now->startOfDay()->getTimestamp();
278 278
 			$this->offset = $now->getOffset();
@@ -283,26 +283,26 @@  discard block
 block discarded – undo
283 283
 			$this->set_datetime_separator();
284 284
 
285 285
 			// Set earliest and latest event timestamps.
286
-			if ( $this->events && is_array( $this->events ) ) {
287
-				$this->earliest_event = intval( current( array_keys( $this->events ) ) );
288
-				$this->latest_event   = intval( key( array_slice( $this->events, -1, 1, true ) ) );
286
+			if ($this->events && is_array($this->events)) {
287
+				$this->earliest_event = intval(current(array_keys($this->events)));
288
+				$this->latest_event   = intval(key(array_slice($this->events, -1, 1, true)));
289 289
 			}
290 290
 
291 291
 			// Set calendar end.
292 292
 			$this->set_end();
293 293
 
294 294
 			// Set view.
295
-			if ( ! $view ) {
295
+			if ( ! $view) {
296 296
 
297
-				$calendar_view = get_post_meta( $this->id, '_calendar_view', true );
298
-				$calendar_view = isset( $calendar_view[ $this->type ] ) ? $calendar_view[ $this->type ] : '';
297
+				$calendar_view = get_post_meta($this->id, '_calendar_view', true);
298
+				$calendar_view = isset($calendar_view[$this->type]) ? $calendar_view[$this->type] : '';
299 299
 
300
-				$view = esc_attr( $calendar_view );
300
+				$view = esc_attr($calendar_view);
301 301
 			}
302 302
 		}
303 303
 
304 304
 		// Get view.
305
-		$this->view = $this->get_view( $view );
305
+		$this->view = $this->get_view($view);
306 306
 	}
307 307
 
308 308
 	/**
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
 	 *
315 315
 	 * @return bool
316 316
 	 */
317
-	public function __isset( $key ) {
318
-		return metadata_exists( 'post', $this->id, '_' . $key );
317
+	public function __isset($key) {
318
+		return metadata_exists('post', $this->id, '_'.$key);
319 319
 	}
320 320
 
321 321
 	/**
@@ -327,9 +327,9 @@  discard block
 block discarded – undo
327 327
 	 *
328 328
 	 * @return mixed
329 329
 	 */
330
-	public function __get( $key ) {
331
-		$value = get_post_meta( $this->id, '_' . $key, true );
332
-		if ( ! empty( $value ) ) {
330
+	public function __get($key) {
331
+		$value = get_post_meta($this->id, '_'.$key, true);
332
+		if ( ! empty($value)) {
333 333
 			$this->$key = $value;
334 334
 		}
335 335
 		return $value;
@@ -342,17 +342,17 @@  discard block
 block discarded – undo
342 342
 	 *
343 343
 	 * @param int|object|\WP_Post|Calendar $calendar
344 344
 	 */
345
-	public function set_post_object( $calendar ) {
346
-		if ( is_numeric( $calendar ) ) {
347
-			$this->id   = absint( $calendar );
348
-			$this->post = get_post( $this->id );
349
-		} elseif ( $calendar instanceof Calendar ) {
350
-			$this->id   = absint( $calendar->id );
345
+	public function set_post_object($calendar) {
346
+		if (is_numeric($calendar)) {
347
+			$this->id   = absint($calendar);
348
+			$this->post = get_post($this->id);
349
+		} elseif ($calendar instanceof Calendar) {
350
+			$this->id   = absint($calendar->id);
351 351
 			$this->post = $calendar->post;
352
-		} elseif ( $calendar instanceof \WP_Post ) {
353
-			$this->id   = absint( $calendar->ID );
352
+		} elseif ($calendar instanceof \WP_Post) {
353
+			$this->id   = absint($calendar->ID);
354 354
 			$this->post = $calendar;
355
-		} elseif ( isset( $calendar->id ) && isset( $calendar->post ) ) {
355
+		} elseif (isset($calendar->id) && isset($calendar->post)) {
356 356
 			$this->id   = $calendar->id;
357 357
 			$this->post = $calendar->post;
358 358
 		}
@@ -366,8 +366,8 @@  discard block
 block discarded – undo
366 366
 	 * @return string
367 367
 	 */
368 368
 	public function get_title() {
369
-		$title = isset( $this->post->post_title ) ? $this->post->post_title : '';
370
-		return apply_filters( 'simcal_calendar_title', $title );
369
+		$title = isset($this->post->post_title) ? $this->post->post_title : '';
370
+		return apply_filters('simcal_calendar_title', $title);
371 371
 	}
372 372
 
373 373
 	/**
@@ -389,16 +389,16 @@  discard block
 block discarded – undo
389 389
 	 */
390 390
 	protected function set_taxonomies() {
391 391
 		// Set calendar type.
392
-		if ( $type = wp_get_object_terms( $this->id, 'calendar_type' ) ) {
393
-			$this->type = sanitize_title( current( $type )->name );
392
+		if ($type = wp_get_object_terms($this->id, 'calendar_type')) {
393
+			$this->type = sanitize_title(current($type)->name);
394 394
 		} else {
395
-			$this->type = apply_filters( 'simcal_calendar_default_type', 'default-calendar' );
395
+			$this->type = apply_filters('simcal_calendar_default_type', 'default-calendar');
396 396
 		}
397 397
 		// Set feed type.
398
-		if ( $feed_type = wp_get_object_terms( $this->id, 'calendar_feed' ) ) {
399
-			$this->feed = sanitize_title( current( $feed_type )->name );
398
+		if ($feed_type = wp_get_object_terms($this->id, 'calendar_feed')) {
399
+			$this->feed = sanitize_title(current($feed_type)->name);
400 400
 		} else {
401
-			$this->feed = apply_filters( 'simcal_calendar_default_feed', 'google' );
401
+			$this->feed = apply_filters('simcal_calendar_default_feed', 'google');
402 402
 		}
403 403
 	}
404 404
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	 * @return Events
411 411
 	 */
412 412
 	public function get_events() {
413
-		return new Events( $this->events, $this->timezone );
413
+		return new Events($this->events, $this->timezone);
414 414
 	}
415 415
 
416 416
 	/**
@@ -420,14 +420,14 @@  discard block
 block discarded – undo
420 420
 	 *
421 421
 	 * @param array $array
422 422
 	 */
423
-	public function set_events( array $array ) {
423
+	public function set_events(array $array) {
424 424
 
425 425
 		$events = array();
426 426
 
427
-		if ( ! empty( $array ) ) {
428
-			foreach ( $array as $tz => $e ) {
429
-				foreach ( $e as $event ) {
430
-					$events[ $tz ][] = $event instanceof Event ? $event : new Event( $event );
427
+		if ( ! empty($array)) {
428
+			foreach ($array as $tz => $e) {
429
+				foreach ($e as $event) {
430
+					$events[$tz][] = $event instanceof Event ? $event : new Event($event);
431 431
 				}
432 432
 			}
433 433
 		}
@@ -444,24 +444,24 @@  discard block
 block discarded – undo
444 444
 	 *
445 445
 	 * @return string
446 446
 	 */
447
-	public function set_events_template( $template = '' ) {
448
-		if ( empty( $template ) ) {
449
-			$template = isset( $this->post->post_content ) ? $this->post->post_content : '';
447
+	public function set_events_template($template = '') {
448
+		if (empty($template)) {
449
+			$template = isset($this->post->post_content) ? $this->post->post_content : '';
450 450
 		}
451 451
 
452 452
 		// TODO: Removed wpautop() call.
453 453
 
454
-		$event_formatting = get_post_meta( $this->id, '_event_formatting', true );
454
+		$event_formatting = get_post_meta($this->id, '_event_formatting', true);
455 455
 
456
-		switch( $event_formatting ) {
456
+		switch ($event_formatting) {
457 457
 			case 'none':
458
-				$this->events_template =  wp_kses_post( trim( $template ) );
458
+				$this->events_template = wp_kses_post(trim($template));
459 459
 				break;
460 460
 			case 'no_linebreaks':
461
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), false );
461
+				$this->events_template = wpautop(wp_kses_post(trim($template)), false);
462 462
 				break;
463 463
 			default:
464
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
464
+				$this->events_template = wpautop(wp_kses_post(trim($template)), true);
465 465
 		}
466 466
 
467 467
 		//$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
@@ -474,37 +474,37 @@  discard block
 block discarded – undo
474 474
 	 *
475 475
 	 * @param string $tz Timezone.
476 476
 	 */
477
-	public function set_timezone( $tz = '' ) {
477
+	public function set_timezone($tz = '') {
478 478
 
479
-		$site_tz = esc_attr( simcal_get_wp_timezone() );
479
+		$site_tz = esc_attr(simcal_get_wp_timezone());
480 480
 
481
-		if ( $this->feed === 'grouped-calendars' ) {
481
+		if ($this->feed === 'grouped-calendars') {
482 482
 			$this->timezone = $site_tz;
483 483
 			return;
484 484
 		}
485 485
 
486
-		if ( empty( $tz ) ) {
486
+		if (empty($tz)) {
487 487
 
488
-			$timezone_setting = get_post_meta( $this->id, '_feed_timezone_setting', true );
488
+			$timezone_setting = get_post_meta($this->id, '_feed_timezone_setting', true);
489 489
 
490
-			if ( 'use_site' == $timezone_setting ) {
490
+			if ('use_site' == $timezone_setting) {
491 491
 				$tz = $site_tz;
492
-			} elseif ( 'use_custom' == $timezone_setting ) {
493
-				$custom_timezone = esc_attr( get_post_meta( $this->id, '_feed_timezone', true ) );
492
+			} elseif ('use_custom' == $timezone_setting) {
493
+				$custom_timezone = esc_attr(get_post_meta($this->id, '_feed_timezone', true));
494 494
 				// One may be using a non standard timezone in GMT (UTC) offset format.
495
-				if ( ( strpos( $custom_timezone, 'UTC+' ) === 0 ) || ( strpos( $custom_timezone, 'UTC-' ) === 0 ) ) {
496
-					$tz = simcal_get_timezone_from_gmt_offset( substr( $custom_timezone, 3 ) );
495
+				if ((strpos($custom_timezone, 'UTC+') === 0) || (strpos($custom_timezone, 'UTC-') === 0)) {
496
+					$tz = simcal_get_timezone_from_gmt_offset(substr($custom_timezone, 3));
497 497
 				} else {
498
-					$tz = ! empty( $custom_timezone ) ? $custom_timezone : 'UTC';
498
+					$tz = ! empty($custom_timezone) ? $custom_timezone : 'UTC';
499 499
 				}
500 500
 			}
501 501
 
502
-			$this->timezone = empty( $tz ) ? 'UTC' : $tz;
502
+			$this->timezone = empty($tz) ? 'UTC' : $tz;
503 503
 			return;
504 504
 		}
505 505
 
506 506
 		$this->site_timezone = $site_tz;
507
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
507
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
508 508
 	}
509 509
 
510 510
 	/**
@@ -514,20 +514,20 @@  discard block
 block discarded – undo
514 514
 	 *
515 515
 	 * @param string $format PHP datetime format.
516 516
 	 */
517
-	public function set_date_format( $format = '' ) {
517
+	public function set_date_format($format = '') {
518 518
 
519 519
 		$date_format_custom = $date_format_default = $format;
520 520
 
521
-		if ( empty( $date_format_custom ) ) {
521
+		if (empty($date_format_custom)) {
522 522
 
523
-			$date_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_date_format_setting', true ) );
524
-			$date_format_default = esc_attr( get_option( 'date_format' ) );
523
+			$date_format_option  = esc_attr(get_post_meta($this->id, '_calendar_date_format_setting', true));
524
+			$date_format_default = esc_attr(get_option('date_format'));
525 525
 			$date_format_custom  = '';
526 526
 
527
-			if ( 'use_custom' == $date_format_option ) {
528
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format', true ) );
529
-			} elseif ( 'use_custom_php' == $date_format_option ) {
530
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format_php', true ) );
527
+			if ('use_custom' == $date_format_option) {
528
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format', true));
529
+			} elseif ('use_custom_php' == $date_format_option) {
530
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format_php', true));
531 531
 			}
532 532
 		}
533 533
 
@@ -541,20 +541,20 @@  discard block
 block discarded – undo
541 541
 	 *
542 542
 	 * @param string $format PHP datetime format.
543 543
 	 */
544
-	public function set_time_format( $format = '' ) {
544
+	public function set_time_format($format = '') {
545 545
 
546 546
 		$time_format_custom = $time_format_default = $format;
547 547
 
548
-		if ( empty( $time_format_custom ) ) {
548
+		if (empty($time_format_custom)) {
549 549
 
550
-			$time_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_time_format_setting', true ) );
551
-			$time_format_default = esc_attr( get_option( 'time_format' ) );
550
+			$time_format_option  = esc_attr(get_post_meta($this->id, '_calendar_time_format_setting', true));
551
+			$time_format_default = esc_attr(get_option('time_format'));
552 552
 			$time_format_custom  = '';
553 553
 
554
-			if ( 'use_custom' == $time_format_option ) {
555
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format', true ) );
556
-			} elseif ( 'use_custom_php' == $time_format_option ) {
557
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format_php', true ) );
554
+			if ('use_custom' == $time_format_option) {
555
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format', true));
556
+			} elseif ('use_custom_php' == $time_format_option) {
557
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format_php', true));
558 558
 			}
559 559
 		}
560 560
 
@@ -568,13 +568,13 @@  discard block
 block discarded – undo
568 568
 	 *
569 569
 	 * @param string $separator A UTF8 character used as separator.
570 570
 	 */
571
-	public function set_datetime_separator( $separator = '' ) {
571
+	public function set_datetime_separator($separator = '') {
572 572
 
573
-		if ( empty( $separator ) ) {
574
-			$separator = get_post_meta( $this->id, '_calendar_datetime_separator', true );
573
+		if (empty($separator)) {
574
+			$separator = get_post_meta($this->id, '_calendar_datetime_separator', true);
575 575
 		}
576 576
 
577
-		$this->datetime_separator = esc_attr( $separator );
577
+		$this->datetime_separator = esc_attr($separator);
578 578
 	}
579 579
 
580 580
 	/**
@@ -584,18 +584,18 @@  discard block
 block discarded – undo
584 584
 	 *
585 585
 	 * @param int $weekday From 0 (Sunday) to 6 (Friday).
586 586
 	 */
587
-	public function set_start_of_week( $weekday = -1 ) {
587
+	public function set_start_of_week($weekday = -1) {
588 588
 
589
-		$week_starts = is_int( $weekday ) ? $weekday : -1;
589
+		$week_starts = is_int($weekday) ? $weekday : -1;
590 590
 
591
-		if ( $week_starts < 0 || $week_starts > 6 ) {
591
+		if ($week_starts < 0 || $week_starts > 6) {
592 592
 
593
-			$week_starts_setting = get_post_meta( $this->id, '_calendar_week_starts_on_setting', true );
594
-			$week_starts         = intval( get_option( 'start_of_week' ) );
593
+			$week_starts_setting = get_post_meta($this->id, '_calendar_week_starts_on_setting', true);
594
+			$week_starts         = intval(get_option('start_of_week'));
595 595
 
596
-			if ( 'use_custom' == $week_starts_setting ) {
597
-				$week_starts_on = get_post_meta( $this->id, '_calendar_week_starts_on', true );
598
-				$week_starts    = is_numeric( $week_starts_on ) ? intval( $week_starts_on ) : $week_starts;
596
+			if ('use_custom' == $week_starts_setting) {
597
+				$week_starts_on = get_post_meta($this->id, '_calendar_week_starts_on', true);
598
+				$week_starts    = is_numeric($week_starts_on) ? intval($week_starts_on) : $week_starts;
599 599
 			}
600 600
 		}
601 601
 
@@ -609,51 +609,51 @@  discard block
 block discarded – undo
609 609
 	 *
610 610
 	 * @param int $timestamp
611 611
 	 */
612
-	public function set_start( $timestamp = 0 ) {
612
+	public function set_start($timestamp = 0) {
613 613
 
614
-		if ( is_int( $timestamp ) && $timestamp !== 0 ) {
614
+		if (is_int($timestamp) && $timestamp !== 0) {
615 615
 			$this->start = $timestamp;
616 616
 			return;
617 617
 		}
618 618
 
619
-		$this->start = Carbon::now( $this->timezone )->getTimestamp();
619
+		$this->start = Carbon::now($this->timezone)->getTimestamp();
620 620
 
621
-		$calendar_begins = esc_attr( get_post_meta( $this->id, '_calendar_begins', true ) );
622
-		$nth = max( absint( get_post_meta( $this->id, '_calendar_begins_nth', true ) ), 1 );
621
+		$calendar_begins = esc_attr(get_post_meta($this->id, '_calendar_begins', true));
622
+		$nth = max(absint(get_post_meta($this->id, '_calendar_begins_nth', true)), 1);
623 623
 
624
-		if ( 'today' == $calendar_begins ) {
625
-			$this->start = Carbon::today( $this->timezone )->getTimestamp();
626
-		} elseif ( 'days_before' == $calendar_begins ) {
627
-			$this->start = Carbon::today( $this->timezone )->subDays( $nth )->getTimestamp();
628
-		} elseif ( 'days_after' == $calendar_begins ) {
629
-			$this->start = Carbon::today( $this->timezone )->addDays( $nth )->getTimestamp();
630
-		} elseif ( 'this_week' == $calendar_begins ) {
631
-			$week = new Carbon( 'now', $this->timezone );
632
-			$week->setWeekStartsAt( $this->week_starts );
624
+		if ('today' == $calendar_begins) {
625
+			$this->start = Carbon::today($this->timezone)->getTimestamp();
626
+		} elseif ('days_before' == $calendar_begins) {
627
+			$this->start = Carbon::today($this->timezone)->subDays($nth)->getTimestamp();
628
+		} elseif ('days_after' == $calendar_begins) {
629
+			$this->start = Carbon::today($this->timezone)->addDays($nth)->getTimestamp();
630
+		} elseif ('this_week' == $calendar_begins) {
631
+			$week = new Carbon('now', $this->timezone);
632
+			$week->setWeekStartsAt($this->week_starts);
633 633
 			$this->start = $week->startOfWeek()->getTimestamp();
634
-		} elseif ( 'weeks_before' == $calendar_begins ) {
635
-			$week = new Carbon( 'now', $this->timezone );
636
-			$week->setWeekStartsAt( $this->week_starts );
637
-			$this->start = $week->startOfWeek()->subWeeks( $nth )->getTimestamp();
638
-		} elseif ( 'weeks_after' == $calendar_begins ) {
639
-			$week = new Carbon( 'now', $this->timezone );
640
-			$week->setWeekStartsAt( $this->week_starts );
641
-			$this->start = $week->startOfWeek()->addWeeks( $nth )->getTimestamp();
642
-		} elseif ( 'this_month' == $calendar_begins ) {
643
-			$this->start = Carbon::today( $this->timezone )->startOfMonth()->getTimeStamp();
644
-		} elseif ( 'months_before' == $calendar_begins ) {
645
-			$this->start = Carbon::today( $this->timezone )->subMonths( $nth )->startOfMonth()->getTimeStamp();
646
-		} elseif ( 'months_after' == $calendar_begins ) {
647
-			$this->start = Carbon::today( $this->timezone )->addMonths( $nth )->startOfMonth()->getTimeStamp();
648
-		} elseif ( 'this_year' == $calendar_begins ) {
649
-			$this->start = Carbon::today( $this->timezone )->startOfYear()->getTimestamp();
650
-		} elseif ( 'years_before' == $calendar_begins ) {
651
-			$this->start = Carbon::today( $this->timezone )->subYears( $nth )->startOfYear()->getTimeStamp();
652
-		} elseif ( 'years_after' == $calendar_begins ) {
653
-			$this->start = Carbon::today( $this->timezone )->addYears( $nth )->startOfYear()->getTimeStamp();
654
-		} elseif ( 'custom_date' == $calendar_begins ) {
655
-			if ( $date = get_post_meta( $this->id, '_calendar_begins_custom_date', true ) ) {
656
-				$this->start = Carbon::createFromFormat( 'Y-m-d', esc_attr( $date ), $this->timezone )->setTimezone( $this->timezone )->startOfDay()->getTimestamp();
634
+		} elseif ('weeks_before' == $calendar_begins) {
635
+			$week = new Carbon('now', $this->timezone);
636
+			$week->setWeekStartsAt($this->week_starts);
637
+			$this->start = $week->startOfWeek()->subWeeks($nth)->getTimestamp();
638
+		} elseif ('weeks_after' == $calendar_begins) {
639
+			$week = new Carbon('now', $this->timezone);
640
+			$week->setWeekStartsAt($this->week_starts);
641
+			$this->start = $week->startOfWeek()->addWeeks($nth)->getTimestamp();
642
+		} elseif ('this_month' == $calendar_begins) {
643
+			$this->start = Carbon::today($this->timezone)->startOfMonth()->getTimeStamp();
644
+		} elseif ('months_before' == $calendar_begins) {
645
+			$this->start = Carbon::today($this->timezone)->subMonths($nth)->startOfMonth()->getTimeStamp();
646
+		} elseif ('months_after' == $calendar_begins) {
647
+			$this->start = Carbon::today($this->timezone)->addMonths($nth)->startOfMonth()->getTimeStamp();
648
+		} elseif ('this_year' == $calendar_begins) {
649
+			$this->start = Carbon::today($this->timezone)->startOfYear()->getTimestamp();
650
+		} elseif ('years_before' == $calendar_begins) {
651
+			$this->start = Carbon::today($this->timezone)->subYears($nth)->startOfYear()->getTimeStamp();
652
+		} elseif ('years_after' == $calendar_begins) {
653
+			$this->start = Carbon::today($this->timezone)->addYears($nth)->startOfYear()->getTimeStamp();
654
+		} elseif ('custom_date' == $calendar_begins) {
655
+			if ($date = get_post_meta($this->id, '_calendar_begins_custom_date', true)) {
656
+				$this->start = Carbon::createFromFormat('Y-m-d', esc_attr($date), $this->timezone)->setTimezone($this->timezone)->startOfDay()->getTimestamp();
657 657
 			}
658 658
 		}
659 659
 	}
@@ -665,8 +665,8 @@  discard block
 block discarded – undo
665 665
 	 *
666 666
 	 * @param int $timestamp
667 667
 	 */
668
-	public function set_end( $timestamp = 0 ) {
669
-		$latest = is_int( $timestamp ) && $timestamp !== 0 ? $timestamp : $this->latest_event;
668
+	public function set_end($timestamp = 0) {
669
+		$latest = is_int($timestamp) && $timestamp !== 0 ? $timestamp : $this->latest_event;
670 670
 		$this->end = $latest > $this->start ? $latest : $this->start;
671 671
 	}
672 672
 
@@ -677,14 +677,14 @@  discard block
 block discarded – undo
677 677
 	 *
678 678
 	 * @param string|bool $static
679 679
 	 */
680
-	public function set_static( $static = '' ) {
680
+	public function set_static($static = '') {
681 681
 
682
-		if ( ! empty( $static ) && is_bool( $static ) ) {
682
+		if ( ! empty($static) && is_bool($static)) {
683 683
 			$this->static = $static;
684 684
 			return;
685 685
 		}
686 686
 
687
-		if ( 'yes' == get_post_meta( $this->id, '_calendar_is_static', true ) ) {
687
+		if ('yes' == get_post_meta($this->id, '_calendar_is_static', true)) {
688 688
 			$this->static = true;
689 689
 			return;
690 690
 		}
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
 	 *
713 713
 	 * @return Calendar_View
714 714
 	 */
715
-	abstract public function get_view( $view = '' );
715
+	abstract public function get_view($view = '');
716 716
 
717 717
 	/**
718 718
 	 * Get event HTML parsed by template.
@@ -724,11 +724,11 @@  discard block
 block discarded – undo
724 724
 	 *
725 725
 	 * @return string
726 726
 	 */
727
-	public function get_event_html( Event $event, $template = '' ) {
728
-		$event_builder = new Event_Builder( $event, $this );
727
+	public function get_event_html(Event $event, $template = '') {
728
+		$event_builder = new Event_Builder($event, $this);
729 729
 		// Use the event template to parse tags; if empty, fallback to calendar post content.
730
-		$template = empty( $template ) ? ( empty( $event->template ) ? $this->events_template : $event->template ) : $template;
731
-		return $event_builder->parse_event_template_tags( $template );
730
+		$template = empty($template) ? (empty($event->template) ? $this->events_template : $event->template) : $template;
731
+		return $event_builder->parse_event_template_tags($template);
732 732
 	}
733 733
 
734 734
 	/**
@@ -738,58 +738,58 @@  discard block
 block discarded – undo
738 738
 	 *
739 739
 	 * @param string $view The calendar view to display.
740 740
 	 */
741
-	public function html( $view = '' ) {
741
+	public function html($view = '') {
742 742
 
743
-		$view = empty( $view ) ? $this->view : $this->get_view( $view );
743
+		$view = empty($view) ? $this->view : $this->get_view($view);
744 744
 
745
-		if ( $view instanceof Calendar_View ) {
745
+		if ($view instanceof Calendar_View) {
746 746
 
747
-			if ( ! empty( $this->errors ) ) {
747
+			if ( ! empty($this->errors)) {
748 748
 
749
-				if ( current_user_can( 'manage_options' )  ) {
749
+				if (current_user_can('manage_options')) {
750 750
 					echo '<pre><code>';
751
-					foreach ( $this->errors as $error ) { echo $error; }
751
+					foreach ($this->errors as $error) { echo $error; }
752 752
 					echo '</code></pre>';
753 753
 				}
754 754
 
755 755
 			} else {
756 756
 
757 757
 				// Get a CSS class from the class name of the calendar view (minus namespace part).
758
-				$view_name  = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( get_class( $view ) ) ) ) );
759
-				$view_class = substr( $view_name, strrpos( $view_name, '\\' ) + 1 );
758
+				$view_name  = implode('-', array_map('lcfirst', explode('_', strtolower(get_class($view)))));
759
+				$view_class = substr($view_name, strrpos($view_name, '\\') + 1);
760 760
 
761
-				$calendar_class = trim( implode( ' simcal-', apply_filters( 'simcal_calendar_class', array(
761
+				$calendar_class = trim(implode(' simcal-', apply_filters('simcal_calendar_class', array(
762 762
 					'simcal-calendar',
763 763
 					$this->type,
764 764
 					$view_class,
765
-				), $this->id ) ) );
766
-
767
-				echo '<div class="' . $calendar_class . '" '
768
-									. 'data-calendar-id="'    . $this->id . '" '
769
-									. 'data-timezone="'       . $this->timezone . '" '
770
-									. 'data-offset="'         . $this->offset . '" '
771
-									. 'data-week-start="'     . $this->week_starts . '" '
772
-									. 'data-calendar-start="' . $this->start .'" '
773
-									. 'data-calendar-end="'   . $this->end . '" '
774
-									. 'data-events-first="'   . $this->earliest_event .'" '
775
-									. 'data-events-last="'    . $this->latest_event . '"'
765
+				), $this->id)));
766
+
767
+				echo '<div class="'.$calendar_class.'" '
768
+									. 'data-calendar-id="'.$this->id.'" '
769
+									. 'data-timezone="'.$this->timezone.'" '
770
+									. 'data-offset="'.$this->offset.'" '
771
+									. 'data-week-start="'.$this->week_starts.'" '
772
+									. 'data-calendar-start="'.$this->start.'" '
773
+									. 'data-calendar-end="'.$this->end.'" '
774
+									. 'data-events-first="'.$this->earliest_event.'" '
775
+									. 'data-events-last="'.$this->latest_event.'"'
776 776
 									. '>';
777 777
 
778
-				date_default_timezone_set( $this->timezone );
779
-				do_action( 'simcal_calendar_html_before', $this->id );
778
+				date_default_timezone_set($this->timezone);
779
+				do_action('simcal_calendar_html_before', $this->id);
780 780
 
781 781
 				$view->html();
782 782
 
783
-				do_action( 'simcal_calendar_html_after', $this->id );
784
-				date_default_timezone_set( $this->site_timezone );
783
+				do_action('simcal_calendar_html_after', $this->id);
784
+				date_default_timezone_set($this->site_timezone);
785 785
 
786 786
 				//$settings = get_option( 'simple-calendar_settings_calendars' );
787
-				$poweredby = get_post_meta( $this->id, '_poweredby', true );
787
+				$poweredby = get_post_meta($this->id, '_poweredby', true);
788 788
 
789
-				if ( 'yes' == $poweredby ) {
789
+				if ('yes' == $poweredby) {
790 790
 					$align = is_rtl() ? 'left' : 'right';
791
-					echo '<small class="simcal-powered simcal-align-' . $align .'">' .
792
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
791
+					echo '<small class="simcal-powered simcal-align-'.$align.'">'.
792
+					     sprintf(__('Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events'), simcal_get_url('home')).
793 793
 					     '</small>';
794 794
 				}
795 795
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/settings.php 1 patch
Spacing   +295 added lines, -295 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 use SimpleCalendar\Abstracts\Feed;
12 12
 use SimpleCalendar\Abstracts\Field;
13 13
 
14
-if ( ! defined( 'ABSPATH' ) ) {
14
+if ( ! defined('ABSPATH')) {
15 15
 	exit;
16 16
 }
17 17
 
@@ -31,40 +31,40 @@  discard block
 block discarded – undo
31 31
 	 *
32 32
 	 * @param \WP_Post $post
33 33
 	 */
34
-	public static function html( $post ) {
34
+	public static function html($post) {
35 35
 
36 36
 		// @see Meta_Boxes::save_meta_boxes()
37
-		wp_nonce_field( 'simcal_save_data', 'simcal_meta_nonce' );
37
+		wp_nonce_field('simcal_save_data', 'simcal_meta_nonce');
38 38
 
39 39
 		?>
40 40
 		<div class="simcal-panels-wrap">
41 41
 
42 42
 			<span class="simcal-box-handle">
43
-				<?php self::settings_handle( $post ); ?>
43
+				<?php self::settings_handle($post); ?>
44 44
 			</span>
45 45
 
46 46
 			<ul class="simcal-tabs">
47
-				<?php self::settings_tabs( $post ); ?>
48
-				<?php do_action( 'simcal_settings_meta_tabs' ); ?>
47
+				<?php self::settings_tabs($post); ?>
48
+				<?php do_action('simcal_settings_meta_tabs'); ?>
49 49
 			</ul>
50 50
 
51 51
 			<div class="simcal-panels">
52 52
 				<div id="events-settings-panel" class="simcal-panel">
53
-					<?php self::events_settings_panel( $post ); ?>
54
-					<?php do_action( 'simcal_settings_meta_events_panel', $post->ID ); ?>
53
+					<?php self::events_settings_panel($post); ?>
54
+					<?php do_action('simcal_settings_meta_events_panel', $post->ID); ?>
55 55
 				</div>
56 56
 				<div id="calendar-settings-panel" class="simcal-panel">
57
-					<?php do_action( 'simcal_settings_meta_calendar_panel', $post->ID ); ?>
58
-					<?php self::calendar_settings_panel( $post ); ?>
57
+					<?php do_action('simcal_settings_meta_calendar_panel', $post->ID); ?>
58
+					<?php self::calendar_settings_panel($post); ?>
59 59
 				</div>
60 60
 				<?php
61 61
 				// Hook for additional settings panels.
62
-				do_action( 'simcal_settings_meta_panels', $post->ID );
62
+				do_action('simcal_settings_meta_panels', $post->ID);
63 63
 				// Thus advanced panel is always the last one:
64 64
 				?>
65 65
 				<div id="advanced-settings-panel" class="simcal-panel">
66
-					<?php self::advanced_settings_panel( $post ) ?>
67
-					<?php do_action( 'simcal_settings_meta_advanced_panel', $post->ID ); ?>
66
+					<?php self::advanced_settings_panel($post) ?>
67
+					<?php do_action('simcal_settings_meta_advanced_panel', $post->ID); ?>
68 68
 				</div>
69 69
 			</div>
70 70
 
@@ -84,45 +84,45 @@  discard block
 block discarded – undo
84 84
 	 *
85 85
 	 * @param \WP_Post $post
86 86
 	 */
87
-	private static function settings_handle( $post ) {
87
+	private static function settings_handle($post) {
88 88
 
89 89
 		$feed_options = $calendar_options = $calendar_views = array();
90 90
 
91 91
 		$feed_types = simcal_get_feed_types();
92
-		foreach ( $feed_types as $feed_type ) {
92
+		foreach ($feed_types as $feed_type) {
93 93
 
94
-			$feed = simcal_get_feed( $feed_type );
94
+			$feed = simcal_get_feed($feed_type);
95 95
 
96
-			if ( $feed instanceof Feed ) {
97
-				$feed_options[ $feed_type ] = $feed->name;
96
+			if ($feed instanceof Feed) {
97
+				$feed_options[$feed_type] = $feed->name;
98 98
 			}
99 99
 		}
100 100
 
101 101
 		$calendar_types = simcal_get_calendar_types();
102
-		foreach ( $calendar_types as $calendar_type => $views ) {
102
+		foreach ($calendar_types as $calendar_type => $views) {
103 103
 
104
-			$calendar = simcal_get_calendar( $calendar_type );
104
+			$calendar = simcal_get_calendar($calendar_type);
105 105
 
106
-			if ( $calendar instanceof Calendar ) {
107
-				$calendar_options[ $calendar_type ] = $calendar->name;
108
-				$calendar_views[ $calendar_type ]   = $calendar->views;
106
+			if ($calendar instanceof Calendar) {
107
+				$calendar_options[$calendar_type] = $calendar->name;
108
+				$calendar_views[$calendar_type]   = $calendar->views;
109 109
 			}
110 110
 		}
111 111
 
112
-		if ( $feed_options ) {
112
+		if ($feed_options) {
113 113
 
114
-			if ( $feed_types = wp_get_object_terms( $post->ID, 'calendar_feed' ) ) {
115
-				$feed_type = sanitize_title( current( $feed_types )->name );
114
+			if ($feed_types = wp_get_object_terms($post->ID, 'calendar_feed')) {
115
+				$feed_type = sanitize_title(current($feed_types)->name);
116 116
 			} else {
117
-				$feed_type = apply_filters( 'simcal_default_feed_type', 'google' );
117
+				$feed_type = apply_filters('simcal_default_feed_type', 'google');
118 118
 			}
119 119
 
120 120
 			?>
121
-			<label for="_feed_type"><span><?php _e( 'Event Source', 'google-calendar-events' ); ?></span>
121
+			<label for="_feed_type"><span><?php _e('Event Source', 'google-calendar-events'); ?></span>
122 122
 				<select name="_feed_type" id="_feed_type">
123
-					<optgroup label="<?php _ex( 'Get events from', 'From which calendar source to load events from', 'google-calendar-events' ) ?>">
124
-						<?php foreach ( $feed_options as $feed => $name ) { ?>
125
-							<option value="<?php echo $feed; ?>" <?php selected( $feed, $feed_type, true ); ?>><?php echo $name; ?></option>
123
+					<optgroup label="<?php _ex('Get events from', 'From which calendar source to load events from', 'google-calendar-events') ?>">
124
+						<?php foreach ($feed_options as $feed => $name) { ?>
125
+							<option value="<?php echo $feed; ?>" <?php selected($feed, $feed_type, true); ?>><?php echo $name; ?></option>
126 126
 						<?php } ?>
127 127
 					</optgroup>
128 128
 				</select>
@@ -131,40 +131,40 @@  discard block
 block discarded – undo
131 131
 
132 132
 		}
133 133
 
134
-		if ( $calendar_options ) {
134
+		if ($calendar_options) {
135 135
 
136
-			if ( $calendar_types = wp_get_object_terms( $post->ID, 'calendar_type' ) ) {
137
-				$calendar_type = sanitize_title( current( $calendar_types )->name );
136
+			if ($calendar_types = wp_get_object_terms($post->ID, 'calendar_type')) {
137
+				$calendar_type = sanitize_title(current($calendar_types)->name);
138 138
 			} else {
139
-				$calendar_type = apply_filters( 'simcal_default_calendar_type', 'default-calendar' );
139
+				$calendar_type = apply_filters('simcal_default_calendar_type', 'default-calendar');
140 140
 			}
141 141
 
142 142
 			?>
143
-			<label for="_calendar_type"><span><?php _e( 'Calendar Type', 'google-calendar-events' ); ?></span>
143
+			<label for="_calendar_type"><span><?php _e('Calendar Type', 'google-calendar-events'); ?></span>
144 144
 				<select name="_calendar_type" id="_calendar_type">
145
-					<optgroup label="<?php _e( 'Calendar to use', 'google-calendar-events' ); ?>">
146
-						<?php foreach ( $calendar_options as $calendar => $name ) { ?>
147
-							<option value="<?php echo $calendar; ?>" <?php selected( $calendar, $calendar_type, true ); ?>><?php echo $name; ?></option>
145
+					<optgroup label="<?php _e('Calendar to use', 'google-calendar-events'); ?>">
146
+						<?php foreach ($calendar_options as $calendar => $name) { ?>
147
+							<option value="<?php echo $calendar; ?>" <?php selected($calendar, $calendar_type, true); ?>><?php echo $name; ?></option>
148 148
 						<?php } ?>
149 149
 					</optgroup>
150 150
 				</select>
151 151
 			</label>
152 152
 			<?php
153 153
 
154
-			if ( $calendar_views ) {
154
+			if ($calendar_views) {
155 155
 
156
-				$calendar_view = get_post_meta( $post->ID, '_calendar_view', true );
156
+				$calendar_view = get_post_meta($post->ID, '_calendar_view', true);
157 157
 
158
-				foreach ( $calendar_views as $calendar => $views ) {
158
+				foreach ($calendar_views as $calendar => $views) {
159 159
 
160
-					$calendar_type_view = isset( $calendar_view[ $calendar ] ) ? $calendar_view[ $calendar ] : '';
160
+					$calendar_type_view = isset($calendar_view[$calendar]) ? $calendar_view[$calendar] : '';
161 161
 
162 162
 					?>
163
-					<label for="_calendar_view_<?php echo $calendar; ?>"><span><?php _e( 'View', 'google-calendar-events' ); ?></span>
163
+					<label for="_calendar_view_<?php echo $calendar; ?>"><span><?php _e('View', 'google-calendar-events'); ?></span>
164 164
 						<select name="_calendar_view[<?php echo $calendar; ?>]" id="_calendar_view_<?php echo $calendar; ?>">
165
-							<optgroup label="<?php _e( 'View to display', 'google-calendar-events' ); ?>">
166
-								<?php foreach ( $views as $view => $name ) { ?>
167
-									<option value="<?php echo $view; ?>" <?php selected( $view, $calendar_type_view, true ); ?>><?php echo $name; ?></option>
165
+							<optgroup label="<?php _e('View to display', 'google-calendar-events'); ?>">
166
+								<?php foreach ($views as $view => $name) { ?>
167
+									<option value="<?php echo $view; ?>" <?php selected($view, $calendar_type_view, true); ?>><?php echo $name; ?></option>
168 168
 								<?php } ?>
169 169
 							</optgroup>
170 170
 						</select>
@@ -184,42 +184,42 @@  discard block
 block discarded – undo
184 184
 	 *
185 185
 	 * @param  \WP_Post $post
186 186
 	 */
187
-	private static function settings_tabs( $post ) {
187
+	private static function settings_tabs($post) {
188 188
 
189 189
 		// Hook to add more tabs.
190
-		$tabs = apply_filters( 'simcal_settings_meta_tabs_li', array(
190
+		$tabs = apply_filters('simcal_settings_meta_tabs_li', array(
191 191
 			'events' => array(
192
-				'label'   => __( 'Events', 'google-calendar-events' ),
192
+				'label'   => __('Events', 'google-calendar-events'),
193 193
 				'target'  => 'events-settings-panel',
194
-				'class'   => array( 'active' ),
194
+				'class'   => array('active'),
195 195
 				'icon'    => 'simcal-icon-event',
196 196
 			),
197 197
 			'calendar' => array(
198
-				'label'  => __( 'Appearance', 'google-calendar-events' ),
198
+				'label'  => __('Appearance', 'google-calendar-events'),
199 199
 				'target' => 'calendar-settings-panel',
200 200
 				'class'  => array(),
201 201
 				'icon'   => 'simcal-icon-calendar',
202 202
 			),
203
-		), $post->ID );
203
+		), $post->ID);
204 204
 
205 205
 		// Always keep advanced tab as the last one.
206 206
 		$tabs['advanced'] = array(
207
-			'label'   => __( 'Advanced', 'google-calendar-events' ),
207
+			'label'   => __('Advanced', 'google-calendar-events'),
208 208
 			'target'  => 'advanced-settings-panel',
209 209
 			'class'   => array(),
210 210
 			'icon'    => 'simcal-icon-settings',
211 211
 		);
212 212
 
213 213
 		// Output the tabs as list items.
214
-		foreach ( $tabs as $key => $tab ) {
214
+		foreach ($tabs as $key => $tab) {
215 215
 
216
-			if ( isset( $tab['target'] ) && isset( $tab['label'] ) ) {
216
+			if (isset($tab['target']) && isset($tab['label'])) {
217 217
 
218 218
 				$icon  = $tab['icon'] ? $tab['icon'] : 'simcal-icon-panel';
219 219
 				$class = $tab['class'] ? $tab['class'] : array();
220 220
 
221
-				echo '<li class="' . $key . '-settings ' . $key . '-tab ' . implode( ' ', $class ) . '" data-tab="' . $key . '">';
222
-				echo    '<a href="#' . $tab['target'] . '"><i class="' . $icon . '" ></i> <span>' . esc_html( $tab['label'] ) . '</span></a>';
221
+				echo '<li class="'.$key.'-settings '.$key.'-tab '.implode(' ', $class).'" data-tab="'.$key.'">';
222
+				echo    '<a href="#'.$tab['target'].'"><i class="'.$icon.'" ></i> <span>'.esc_html($tab['label']).'</span></a>';
223 223
 				echo '</li>';
224 224
 			}
225 225
 		}
@@ -233,22 +233,22 @@  discard block
 block discarded – undo
233 233
 	 *
234 234
 	 * @param  \WP_Post $post
235 235
 	 */
236
-	private static function events_settings_panel( $post ) {
236
+	private static function events_settings_panel($post) {
237 237
 
238 238
 		?>
239 239
 		<table>
240 240
 			<thead>
241
-			<tr><th colspan="2"><?php _e( 'Event Settings', 'google-calendar-events' ); ?></th></tr>
241
+			<tr><th colspan="2"><?php _e('Event Settings', 'google-calendar-events'); ?></th></tr>
242 242
 			</thead>
243 243
 			<tbody class="simcal-panel-section simcal-panel-section-events-range">
244 244
 			<tr class="simcal-panel-field">
245
-				<th><label for="_calendar_begins"><?php _e( 'Calendar Start', 'google-calendar-events' ); ?></label></th>
245
+				<th><label for="_calendar_begins"><?php _e('Calendar Start', 'google-calendar-events'); ?></label></th>
246 246
 				<td>
247 247
 					<?php
248 248
 
249
-					$calendar_begins = esc_attr( get_post_meta( $post->ID, '_calendar_begins', true ) );
250
-					$calendar_begins_nth = max( absint( get_post_meta( $post->ID, '_calendar_begins_nth', true ) ), 1 );
251
-					$calendar_begins_nth_show = in_array( $calendar_begins, array(
249
+					$calendar_begins = esc_attr(get_post_meta($post->ID, '_calendar_begins', true));
250
+					$calendar_begins_nth = max(absint(get_post_meta($post->ID, '_calendar_begins_nth', true)), 1);
251
+					$calendar_begins_nth_show = in_array($calendar_begins, array(
252 252
 						'days_before',
253 253
 						'days_after',
254 254
 						'weeks_before',
@@ -257,14 +257,14 @@  discard block
 block discarded – undo
257 257
 						'months_after',
258 258
 						'years_before',
259 259
 						'years_after',
260
-					) );
260
+					));
261 261
 
262
-					simcal_print_field( array(
262
+					simcal_print_field(array(
263 263
 						'type'       => 'standard',
264 264
 						'subtype'    => 'number',
265 265
 						'name'       => '_calendar_begins_nth',
266 266
 						'id'         => '_calendar_begins_nth',
267
-						'value'      => strval( $calendar_begins_nth ),
267
+						'value'      => strval($calendar_begins_nth),
268 268
 						'attributes' => array(
269 269
 							'min' => '1',
270 270
 						),
@@ -272,97 +272,97 @@  discard block
 block discarded – undo
272 272
 							'simcal-field-inline',
273 273
 							'simcal-field-tiny',
274 274
 						),
275
-						'style'      => ! $calendar_begins_nth_show ? array( 'display' => 'none' ) : '',
276
-					) );
275
+						'style'      => ! $calendar_begins_nth_show ? array('display' => 'none') : '',
276
+					));
277 277
 
278 278
 					?>
279 279
 					<select name="_calendar_begins"
280 280
 							id="_calendar_begins"
281 281
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
282
-						<optgroup label="<?php _e( 'Days', 'google-calendar-events' ); ?>">
282
+						<optgroup label="<?php _e('Days', 'google-calendar-events'); ?>">
283 283
 							<option value="today"
284 284
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
285
-								<?php selected( 'today', $calendar_begins, true ); ?>><?php _e( 'Today', 'google-calendar-events' ); ?></option>
285
+								<?php selected('today', $calendar_begins, true); ?>><?php _e('Today', 'google-calendar-events'); ?></option>
286 286
 							<option value="now"
287 287
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
288
-								<?php selected( 'now', $calendar_begins, true ); ?>><?php _e( 'Now', 'google-calendar-events' ); ?></option>
288
+								<?php selected('now', $calendar_begins, true); ?>><?php _e('Now', 'google-calendar-events'); ?></option>
289 289
 							<option value="days_before"
290 290
 									data-hide-field="_calendar_begins_custom_date"
291
-									data-show-field="_calendar_begins_nth" <?php selected( 'days_before', $calendar_begins, true ); ?>><?php _e( 'Day(s) before today', 'google-calendar-events' ); ?></option>
291
+									data-show-field="_calendar_begins_nth" <?php selected('days_before', $calendar_begins, true); ?>><?php _e('Day(s) before today', 'google-calendar-events'); ?></option>
292 292
 							<option value="days_after"
293 293
 									data-hide-field="_calendar_begins_custom_date"
294
-									data-show-field="_calendar_begins_nth" <?php selected( 'days_after', $calendar_begins, true ); ?>><?php _e( 'Day(s) after today', 'google-calendar-events' ); ?></option>
294
+									data-show-field="_calendar_begins_nth" <?php selected('days_after', $calendar_begins, true); ?>><?php _e('Day(s) after today', 'google-calendar-events'); ?></option>
295 295
 						</optgroup>
296
-						<optgroup label="<?php _e( 'Weeks', 'google-calendar-events' ); ?>">
296
+						<optgroup label="<?php _e('Weeks', 'google-calendar-events'); ?>">
297 297
 							<option value="this_week"
298 298
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
299
-								<?php selected( 'this_week', $calendar_begins, true ); ?>><?php _e( 'This week', 'google-calendar-events' ); ?></option>
299
+								<?php selected('this_week', $calendar_begins, true); ?>><?php _e('This week', 'google-calendar-events'); ?></option>
300 300
 							<option value="weeks_before"
301 301
 									data-hide-field="_calendar_begins_custom_date"
302
-									data-show-field="_calendar_begins_nth" <?php selected( 'weeks_before', $calendar_begins, true ); ?>><?php _e( 'Week(s) before current', 'google-calendar-events' ); ?></option>
302
+									data-show-field="_calendar_begins_nth" <?php selected('weeks_before', $calendar_begins, true); ?>><?php _e('Week(s) before current', 'google-calendar-events'); ?></option>
303 303
 							<option value="weeks_after"
304 304
 									data-hide-field="_calendar_begins_custom_date"
305
-									data-show-field="_calendar_begins_nth" <?php selected( 'weeks_after', $calendar_begins, true ); ?>><?php _e( 'Week(s) after current', 'google-calendar-events' ); ?></option>
305
+									data-show-field="_calendar_begins_nth" <?php selected('weeks_after', $calendar_begins, true); ?>><?php _e('Week(s) after current', 'google-calendar-events'); ?></option>
306 306
 						</optgroup>
307
-						<optgroup label="<?php _e( 'Months', 'google-calendar-events' ); ?>">
307
+						<optgroup label="<?php _e('Months', 'google-calendar-events'); ?>">
308 308
 							<option value="this_month"
309 309
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
310
-								<?php selected( 'this_month', $calendar_begins, true ); ?>><?php _e( 'This month', 'google-calendar-events' ); ?></option>
310
+								<?php selected('this_month', $calendar_begins, true); ?>><?php _e('This month', 'google-calendar-events'); ?></option>
311 311
 							<option value="months_before"
312 312
 									data-hide-field="_calendar_begins_custom_date"
313
-									data-show-field="_calendar_begins_nth" <?php selected( 'months_before', $calendar_begins, true ); ?>><?php _e( 'Month(s) before current', 'google-calendar-events' ); ?></option>
313
+									data-show-field="_calendar_begins_nth" <?php selected('months_before', $calendar_begins, true); ?>><?php _e('Month(s) before current', 'google-calendar-events'); ?></option>
314 314
 							<option value="months_after"
315 315
 									data-hide-field="_calendar_begins_custom_date"
316
-									data-show-field="_calendar_begins_nth" <?php selected( 'months_after', $calendar_begins, true ); ?>><?php _e( 'Month(s) after current', 'google-calendar-events' ); ?></option>
316
+									data-show-field="_calendar_begins_nth" <?php selected('months_after', $calendar_begins, true); ?>><?php _e('Month(s) after current', 'google-calendar-events'); ?></option>
317 317
 						</optgroup>
318
-						<optgroup label="<?php _e( 'Years', 'google-calendar-events' ); ?>">
318
+						<optgroup label="<?php _e('Years', 'google-calendar-events'); ?>">
319 319
 							<option value="this_year"
320 320
 									data-hide-fields="_calendar_begins_custom_date,_calendar_begins_nth"
321
-								<?php selected( 'this_year', $calendar_begins, true ); ?>><?php _e( 'This year', 'google-calendar-events' ); ?></option>
321
+								<?php selected('this_year', $calendar_begins, true); ?>><?php _e('This year', 'google-calendar-events'); ?></option>
322 322
 							<option value="years_before"
323
-									data-show-field="_calendar_begins_nth" <?php selected( 'years_before', $calendar_begins, true ); ?>><?php _e( 'Year(s) before current', 'google-calendar-events' ); ?></option>
323
+									data-show-field="_calendar_begins_nth" <?php selected('years_before', $calendar_begins, true); ?>><?php _e('Year(s) before current', 'google-calendar-events'); ?></option>
324 324
 							<option value="years_after"
325 325
 									data-hide-field="_calendar_begins_custom_date"
326
-									data-show-field="_calendar_begins_nth" <?php selected( 'years_after', $calendar_begins, true ); ?>><?php _e( 'Year(s) after current', 'google-calendar-events' ); ?></option>
326
+									data-show-field="_calendar_begins_nth" <?php selected('years_after', $calendar_begins, true); ?>><?php _e('Year(s) after current', 'google-calendar-events'); ?></option>
327 327
 						</optgroup>
328
-						<optgroup label="<?php _e( 'Other', 'google-calendar-events' ); ?>">
328
+						<optgroup label="<?php _e('Other', 'google-calendar-events'); ?>">
329 329
 							<option value="custom_date"
330 330
 									data-hide-field="_calendar_begins_nth"
331
-									data-show-field="_calendar_begins_custom_date" <?php selected( 'custom_date', $calendar_begins, true ); ?>><?php _e( 'Specific date', 'google-calendar-events' ); ?></option>
331
+									data-show-field="_calendar_begins_custom_date" <?php selected('custom_date', $calendar_begins, true); ?>><?php _e('Specific date', 'google-calendar-events'); ?></option>
332 332
 						</optgroup>
333 333
 					</select>
334 334
 					<?php
335 335
 
336
-					simcal_print_field( array(
336
+					simcal_print_field(array(
337 337
 						'type'    => 'date-picker',
338 338
 						'name'    => '_calendar_begins_custom_date',
339 339
 						'id'      => '_calendar_begins_custom_date',
340
-						'value'   => get_post_meta( $post->ID, '_calendar_begins_custom_date', true ),
340
+						'value'   => get_post_meta($post->ID, '_calendar_begins_custom_date', true),
341 341
 						'class' => array(
342 342
 							'simcal-field-inline',
343 343
 						),
344
-						'style'   => 'custom_date' != $calendar_begins ? array( 'display' => 'none' ) : '',
345
-					) );
344
+						'style'   => 'custom_date' != $calendar_begins ? array('display' => 'none') : '',
345
+					));
346 346
 
347 347
 					?>
348 348
 					<i class="simcal-icon-help simcal-help-tip"
349
-					   data-tip="<?php _e( 'The calendar default opening date. It will automatically adapt based on the chosen calendar type.', 'google-calendar-events' ); ?>"></i>
349
+					   data-tip="<?php _e('The calendar default opening date. It will automatically adapt based on the chosen calendar type.', 'google-calendar-events'); ?>"></i>
350 350
 				</td>
351 351
 			</tr>
352 352
 			<tr class="simcal-panel-field">
353
-				<th><label for="_feed_earliest_event_date"><?php _e( 'Earliest Event', 'google-calendar-events' ); ?></label></th>
353
+				<th><label for="_feed_earliest_event_date"><?php _e('Earliest Event', 'google-calendar-events'); ?></label></th>
354 354
 				<td>
355 355
 					<?php
356 356
 
357
-					$earliest_event_saved = get_post_meta( $post->ID, '_feed_earliest_event_date', true );
358
-					$earliest_event = false == $earliest_event_saved ? 'months_before' : esc_attr( $earliest_event_saved );
357
+					$earliest_event_saved = get_post_meta($post->ID, '_feed_earliest_event_date', true);
358
+					$earliest_event = false == $earliest_event_saved ? 'months_before' : esc_attr($earliest_event_saved);
359 359
 
360
-					simcal_print_field( array(
360
+					simcal_print_field(array(
361 361
 						'type'       => 'standard',
362 362
 						'subtype'    => 'number',
363 363
 						'name'       => '_feed_earliest_event_date_range',
364 364
 						'id'         => '_feed_earliest_event_date_range',
365
-						'value'      => strval( max( absint( get_post_meta( $post->ID, '_feed_earliest_event_date_range', true ) ), 1 ) ),
365
+						'value'      => strval(max(absint(get_post_meta($post->ID, '_feed_earliest_event_date_range', true)), 1)),
366 366
 						'attributes' => array(
367 367
 							'min' => '1',
368 368
 						),
@@ -370,37 +370,37 @@  discard block
 block discarded – undo
370 370
 							'simcal-field-inline',
371 371
 							'simcal-field-tiny',
372 372
 						),
373
-						'style'      => ( 'now' != $earliest_event ) && ( 'today' != $earliest_event ) ? array( 'display' => 'none' ) : '',
374
-					) );
373
+						'style'      => ('now' != $earliest_event) && ('today' != $earliest_event) ? array('display' => 'none') : '',
374
+					));
375 375
 
376 376
 					?>
377 377
 					<select name="_feed_earliest_event_date"
378 378
 							id="_feed_earliest_event_date"
379 379
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
380
-						<option value="calendar_start" data-hide-field="_feed_earliest_event_date_range" <?php selected( 'calendar_start', $earliest_event, true ); ?>><?php _e( 'Same as start date', 'google-calendar-events' ); ?></option>
381
-						<option value="days_before"    data-show-field="_feed_earliest_event_date_range" <?php selected( 'days_before', $earliest_event, true ); ?>><?php _e( 'Day(s) before start date', 'google-calendar-events' ); ?></option>
382
-						<option value="weeks_before"   data-show-field="_feed_earliest_event_date_range" <?php selected( 'weeks_before', $earliest_event, true ); ?>><?php _e( 'Week(s) before start date', 'google-calendar-events' ); ?></option>
383
-						<option value="months_before"  data-show-field="_feed_earliest_event_date_range" <?php selected( 'months_before', $earliest_event, true ); ?>><?php _e( 'Month(s) before start date', 'google-calendar-events' ); ?></option>
384
-						<option value="years_before"   data-show-field="_feed_earliest_event_date_range" <?php selected( 'years_before', $earliest_event, true ); ?>><?php _e( 'Year(s) before start date', 'google-calendar-events' ); ?></option>
380
+						<option value="calendar_start" data-hide-field="_feed_earliest_event_date_range" <?php selected('calendar_start', $earliest_event, true); ?>><?php _e('Same as start date', 'google-calendar-events'); ?></option>
381
+						<option value="days_before"    data-show-field="_feed_earliest_event_date_range" <?php selected('days_before', $earliest_event, true); ?>><?php _e('Day(s) before start date', 'google-calendar-events'); ?></option>
382
+						<option value="weeks_before"   data-show-field="_feed_earliest_event_date_range" <?php selected('weeks_before', $earliest_event, true); ?>><?php _e('Week(s) before start date', 'google-calendar-events'); ?></option>
383
+						<option value="months_before"  data-show-field="_feed_earliest_event_date_range" <?php selected('months_before', $earliest_event, true); ?>><?php _e('Month(s) before start date', 'google-calendar-events'); ?></option>
384
+						<option value="years_before"   data-show-field="_feed_earliest_event_date_range" <?php selected('years_before', $earliest_event, true); ?>><?php _e('Year(s) before start date', 'google-calendar-events'); ?></option>
385 385
 					</select>
386 386
 					<i class="simcal-icon-help simcal-help-tip"
387
-					   data-tip="<?php _e( 'Set the date for the earliest possible event to show in calendar. There will not be events before this date.', 'google-calendar-events' ); ?>"></i>
387
+					   data-tip="<?php _e('Set the date for the earliest possible event to show in calendar. There will not be events before this date.', 'google-calendar-events'); ?>"></i>
388 388
 				</td>
389 389
 			</tr>
390 390
 			<tr class="simcal-panel-field">
391
-				<th><label for="_feed_latest_event_date"><?php _e( 'Latest Event', 'google-calendar-events' ); ?></label></th>
391
+				<th><label for="_feed_latest_event_date"><?php _e('Latest Event', 'google-calendar-events'); ?></label></th>
392 392
 				<td>
393 393
 					<?php
394 394
 
395
-					$latest_event_saved = get_post_meta( $post->ID, '_feed_latest_event_date', true );
396
-					$latest_event = false == $latest_event_saved ? 'years_after' : esc_attr( $latest_event_saved );
395
+					$latest_event_saved = get_post_meta($post->ID, '_feed_latest_event_date', true);
396
+					$latest_event = false == $latest_event_saved ? 'years_after' : esc_attr($latest_event_saved);
397 397
 
398
-					simcal_print_field( array(
398
+					simcal_print_field(array(
399 399
 						'type'       => 'standard',
400 400
 						'subtype'    => 'number',
401 401
 						'name'       => '_feed_latest_event_date_range',
402 402
 						'id'         => '_feed_latest_event_date_range',
403
-						'value'      => strval( max( absint( get_post_meta( $post->ID, '_feed_latest_event_date_range', true ) ), 1 ) ),
403
+						'value'      => strval(max(absint(get_post_meta($post->ID, '_feed_latest_event_date_range', true)), 1)),
404 404
 						'attributes' => array(
405 405
 							'min' => '1',
406 406
 						),
@@ -408,21 +408,21 @@  discard block
 block discarded – undo
408 408
 							'simcal-field-inline',
409 409
 							'simcal-field-tiny',
410 410
 						),
411
-						'style'      => 'indefinite' != $latest_event ? array( 'display' => 'none' ) : '',
412
-					) );
411
+						'style'      => 'indefinite' != $latest_event ? array('display' => 'none') : '',
412
+					));
413 413
 
414 414
 					?>
415 415
 					<select name="_feed_latest_event_date"
416 416
 							id="_feed_latest_event_date"
417 417
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-switch-other">
418
-						<option value="calendar_start" data-hide-field="_feed_latest_event_date_range" <?php selected( 'calendar_start', $earliest_event, true ); ?>><?php _e( 'Day end of start date', 'google-calendar-events' ); ?></option>
419
-						<option value="days_after"     data-show-field="_feed_latest_event_date_range" <?php selected( 'days_after', $latest_event, true ); ?>><?php _e( 'Day(s) after start date', 'google-calendar-events' ); ?></option>
420
-						<option value="weeks_after"    data-show-field="_feed_latest_event_date_range" <?php selected( 'weeks_after', $latest_event, true ); ?>><?php _e( 'Weeks(s) after start date', 'google-calendar-events' ); ?></option>
421
-						<option value="months_after"   data-show-field="_feed_latest_event_date_range" <?php selected( 'months_after', $latest_event, true ); ?>><?php _e( 'Month(s) after start date', 'google-calendar-events' ); ?></option>
422
-						<option value="years_after"    data-show-field="_feed_latest_event_date_range" <?php selected( 'years_after', $latest_event, true ); ?>><?php _e( 'Year(s) after start date', 'google-calendar-events' ); ?></option>
418
+						<option value="calendar_start" data-hide-field="_feed_latest_event_date_range" <?php selected('calendar_start', $earliest_event, true); ?>><?php _e('Day end of start date', 'google-calendar-events'); ?></option>
419
+						<option value="days_after"     data-show-field="_feed_latest_event_date_range" <?php selected('days_after', $latest_event, true); ?>><?php _e('Day(s) after start date', 'google-calendar-events'); ?></option>
420
+						<option value="weeks_after"    data-show-field="_feed_latest_event_date_range" <?php selected('weeks_after', $latest_event, true); ?>><?php _e('Weeks(s) after start date', 'google-calendar-events'); ?></option>
421
+						<option value="months_after"   data-show-field="_feed_latest_event_date_range" <?php selected('months_after', $latest_event, true); ?>><?php _e('Month(s) after start date', 'google-calendar-events'); ?></option>
422
+						<option value="years_after"    data-show-field="_feed_latest_event_date_range" <?php selected('years_after', $latest_event, true); ?>><?php _e('Year(s) after start date', 'google-calendar-events'); ?></option>
423 423
 					</select>
424 424
 					<i class="simcal-icon-help simcal-help-tip"
425
-					   data-tip="<?php _e( 'Set the date for the latest possible event to show on calendar. There will not be events after this date.', 'google-calendar-events' ); ?>"></i>
425
+					   data-tip="<?php _e('Set the date for the latest possible event to show on calendar. There will not be events after this date.', 'google-calendar-events'); ?>"></i>
426 426
 				</td>
427 427
 			</tr>
428 428
 			</tbody>
@@ -439,88 +439,88 @@  discard block
 block discarded – undo
439 439
 	 *
440 440
 	 * @param  \WP_Post $post
441 441
 	 */
442
-	private static function calendar_settings_panel( $post ) {
442
+	private static function calendar_settings_panel($post) {
443 443
 
444 444
 		?>
445 445
 		<table>
446 446
 			<thead>
447
-			<tr><th colspan="2"><?php _e( 'Miscellaneous', 'google-calendar-events' ); ?></th></tr>
447
+			<tr><th colspan="2"><?php _e('Miscellaneous', 'google-calendar-events'); ?></th></tr>
448 448
 			</thead>
449 449
 			<tbody class="simcal-panel-section">
450 450
 			<tr class="simcal-panel-field">
451
-				<th><label for="_calendar_is_static"><?php _e( 'Static Calendar', 'google-calendar-events' ); ?></label></th>
451
+				<th><label for="_calendar_is_static"><?php _e('Static Calendar', 'google-calendar-events'); ?></label></th>
452 452
 				<td>
453 453
 					<?php
454 454
 
455
-					$fixed = get_post_meta( $post->ID, '_calendar_is_static', true );
455
+					$fixed = get_post_meta($post->ID, '_calendar_is_static', true);
456 456
 
457
-					simcal_print_field( array(
457
+					simcal_print_field(array(
458 458
 						'type'    => 'checkbox',
459 459
 						'name'    => '_calendar_is_static',
460 460
 						'id'      => '_calendar_is_static',
461
-						'tooltip' => __( 'Remove the navigation arrows and fix the calendar view to its initial state.', 'google-calendar-events' ),
461
+						'tooltip' => __('Remove the navigation arrows and fix the calendar view to its initial state.', 'google-calendar-events'),
462 462
 						'value'   => 'yes' == $fixed ? 'yes' : 'no',
463
-						'text'    => __( 'Yes (hide navigation arrows)', 'google-calendar-events' ),
464
-					) );
463
+						'text'    => __('Yes (hide navigation arrows)', 'google-calendar-events'),
464
+					));
465 465
 
466 466
 					?>
467 467
 				</td>
468 468
 			</tr>
469 469
 			<tr class="simcal-panel-field">
470
-				<th><label for="_no_events_message"><?php _e( 'No Events Message', 'google-calendar-events' ); ?></label></th>
470
+				<th><label for="_no_events_message"><?php _e('No Events Message', 'google-calendar-events'); ?></label></th>
471 471
 				<td>
472 472
 					<?php
473 473
 
474
-					simcal_print_field( array(
474
+					simcal_print_field(array(
475 475
 						'type'    => 'textarea',
476 476
 						'name'    => '_no_events_message',
477 477
 						'id'      => '_no_events_message',
478
-						'tooltip' => __( 'Some calendars may display a message when no events are found. You can change the default message here.', 'google-calendar-events' ),
479
-						'value'   => get_post_meta( $post->ID, '_no_events_message', true ),
480
-						'placeholder' => __( 'There are no upcoming events.', 'google-calendar-events' ),
481
-					) );
478
+						'tooltip' => __('Some calendars may display a message when no events are found. You can change the default message here.', 'google-calendar-events'),
479
+						'value'   => get_post_meta($post->ID, '_no_events_message', true),
480
+						'placeholder' => __('There are no upcoming events.', 'google-calendar-events'),
481
+					));
482 482
 
483 483
 					?>
484 484
 				</td>
485 485
 			</tr>
486 486
 			<tr class="simcal-panel-field">
487
-				<th><label for="_event_formatting"><?php _e( 'Event Formatting', 'google-calendar-events' ); ?></label></th>
487
+				<th><label for="_event_formatting"><?php _e('Event Formatting', 'google-calendar-events'); ?></label></th>
488 488
 				<td>
489 489
 					<?php
490 490
 
491
-					$event_formatting = get_post_meta( $post->ID, '_event_formatting', true );
491
+					$event_formatting = get_post_meta($post->ID, '_event_formatting', true);
492 492
 
493
-					simcal_print_field( array(
493
+					simcal_print_field(array(
494 494
 						'type'    => 'select',
495 495
 						'name'    => '_event_formatting',
496 496
 						'id'      => '_event_formatting',
497
-						'tooltip' => __( 'How to preserve line breaks and paragraphs in the event template builder.', 'google-calendar-events' ),
497
+						'tooltip' => __('How to preserve line breaks and paragraphs in the event template builder.', 'google-calendar-events'),
498 498
 						'value'   => $event_formatting,
499 499
 						'default' => 'preserve_linebreaks',
500 500
 						'options' => array(
501
-							'preserve_linebreaks' => __( 'Preserve line breaks, auto paragraphs (default)', 'google-calendar-events' ),
502
-							'no_linebreaks'       => __( 'No line breaks, auto paragraphs', 'google-calendar-events' ),
503
-							'none'                => __( 'No line breaks, no auto paragraphs', 'google-calendar-events' ),
501
+							'preserve_linebreaks' => __('Preserve line breaks, auto paragraphs (default)', 'google-calendar-events'),
502
+							'no_linebreaks'       => __('No line breaks, auto paragraphs', 'google-calendar-events'),
503
+							'none'                => __('No line breaks, no auto paragraphs', 'google-calendar-events'),
504 504
 						),
505
-					) );
505
+					));
506 506
 
507 507
 					?>
508 508
 				</td>
509 509
 			</tr>
510 510
 			<tr class="simcal-panel-field">
511
-				<th><label for="_poweredby"><?php _e( 'Powered By', 'google-calendar-events' ); ?></label></th>
511
+				<th><label for="_poweredby"><?php _e('Powered By', 'google-calendar-events'); ?></label></th>
512 512
 				<td>
513 513
 					<?php
514 514
 
515
-					$poweredby = get_post_meta( $post->ID, '_poweredby', true );
515
+					$poweredby = get_post_meta($post->ID, '_poweredby', true);
516 516
 
517
-					simcal_print_field( array(
517
+					simcal_print_field(array(
518 518
 						'type'    => 'checkbox',
519 519
 						'name'    => '_poweredby',
520 520
 						'id'      => '_poweredby',
521 521
 						'value'   => 'yes' == $poweredby ? 'yes' : 'no',
522
-						'text'    => __( 'Yes, Simple Calendar rocks! Show some love with a little link below this calendar.', 'google-calendar-events' ),
523
-					) );
522
+						'text'    => __('Yes, Simple Calendar rocks! Show some love with a little link below this calendar.', 'google-calendar-events'),
523
+					));
524 524
 
525 525
 					?>
526 526
 				</td>
@@ -539,28 +539,28 @@  discard block
 block discarded – undo
539 539
 	 *
540 540
 	 * @param  \WP_Post $post
541 541
 	 */
542
-	private static function advanced_settings_panel( $post ) {
542
+	private static function advanced_settings_panel($post) {
543 543
 
544 544
 		?>
545 545
 		<table>
546 546
 			<thead>
547
-			<tr><th colspan="2"><?php _e( 'Date and Time', 'google-calendar-events' ); ?></th></tr>
547
+			<tr><th colspan="2"><?php _e('Date and Time', 'google-calendar-events'); ?></th></tr>
548 548
 			</thead>
549 549
 			<tbody class="simcal-panel-section simcal-panel-datetime-formatting">
550 550
 			<tr class="simcal-panel-field">
551
-				<th><label for="_calendar_timezone_setting"><?php _e( 'Timezone', 'google-calendar-events' ); ?></label></th>
551
+				<th><label for="_calendar_timezone_setting"><?php _e('Timezone', 'google-calendar-events'); ?></label></th>
552 552
 				<td>
553 553
 					<?php
554 554
 
555 555
 					$timezone_wordpress = simcal_get_wp_timezone();
556 556
 					$timezone_default   = $timezone_wordpress ? $timezone_wordpress : 'UTC';
557
-					$timezone_setting   = esc_attr( get_post_meta( $post->ID, '_feed_timezone_setting', true ) );
558
-					$timezone           = esc_attr( get_post_meta( $post->ID, '_feed_timezone', true ) );
557
+					$timezone_setting   = esc_attr(get_post_meta($post->ID, '_feed_timezone_setting', true));
558
+					$timezone           = esc_attr(get_post_meta($post->ID, '_feed_timezone', true));
559 559
 					$timezone           = $timezone ? $timezone : $timezone_default;
560
-					$show_use_calendar  = isset( simcal_get_feed( $post )->type );
560
+					$show_use_calendar  = isset(simcal_get_feed($post)->type);
561 561
 
562
-					if ( $show_use_calendar ) {
563
-						$show_use_calendar = ( simcal_get_feed( $post )->type !== 'grouped-calendars' ? 1 : 0 );
562
+					if ($show_use_calendar) {
563
+						$show_use_calendar = (simcal_get_feed($post)->type !== 'grouped-calendars' ? 1 : 0);
564 564
 					} else {
565 565
 						$show_use_calendar = true;
566 566
 					}
@@ -570,56 +570,56 @@  discard block
 block discarded – undo
570 570
 							id="_feed_timezone_setting"
571 571
 							class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-other"
572 572
 							data-show-field-on-choice="true">
573
-						<option value="use_site" <?php selected( 'use_site', $timezone_setting, true ); ?>><?php printf( _x( 'Site default', 'Use this site default setting', 'google-calendar-events' ) . ' (%s)', $timezone_default ); ?></option>
574
-						<?php if ( $show_use_calendar ) { ?>
575
-							<option id="use_calendar" value="use_calendar" data-show-field="_use_calendar_warning" <?php selected( 'use_calendar', $timezone_setting, true ); ?>><?php _ex( 'Events source default', 'Use the calendar default setting', 'google-calendar-events' ); ?></option>
573
+						<option value="use_site" <?php selected('use_site', $timezone_setting, true); ?>><?php printf(_x('Site default', 'Use this site default setting', 'google-calendar-events').' (%s)', $timezone_default); ?></option>
574
+						<?php if ($show_use_calendar) { ?>
575
+							<option id="use_calendar" value="use_calendar" data-show-field="_use_calendar_warning" <?php selected('use_calendar', $timezone_setting, true); ?>><?php _ex('Events source default', 'Use the calendar default setting', 'google-calendar-events'); ?></option>
576 576
 						<?php } ?>
577
-						<option value="use_custom" data-show-field="_feed_timezone" <?php selected( 'use_custom', $timezone_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
577
+						<option value="use_custom" data-show-field="_feed_timezone" <?php selected('use_custom', $timezone_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
578 578
 					</select>
579 579
 					<select name="_feed_timezone"
580 580
 							id="_feed_timezone"
581 581
 							class="simcal-field simcal-field-select simcal-field-inline"
582 582
 						<?php echo 'use_custom' != $timezone_setting ? 'style="display: none;"' : ''; ?>>
583
-						<?php echo wp_timezone_choice( $timezone ); ?>
583
+						<?php echo wp_timezone_choice($timezone); ?>
584 584
 					</select>
585
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Using a different timezone may alter the date and time display of your calendar events. It is recommended to keep the calendar default timezone.', 'google-calendar-events' ); ?>"></i>
585
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Using a different timezone may alter the date and time display of your calendar events. It is recommended to keep the calendar default timezone.', 'google-calendar-events'); ?>"></i>
586 586
 					<p id="_use_calendar_warning" style="display: none;" class="simcal-field">
587
-						<?php printf( __( '<strong>Warning:</strong> Using this option can return unexpected results if you have specified <a href="%s" target="_blank">event level</a> timezones.', 'google-calendar-events' ), 'http://docs.simplecalendar.io/timezone-settings/' ); ?>
587
+						<?php printf(__('<strong>Warning:</strong> Using this option can return unexpected results if you have specified <a href="%s" target="_blank">event level</a> timezones.', 'google-calendar-events'), 'http://docs.simplecalendar.io/timezone-settings/'); ?>
588 588
 					</p>
589 589
 				</td>
590 590
 			</tr>
591 591
 			<tr class="simcal-panel-field">
592
-				<th><label for="_calendar_date_format_setting"><?php _e( 'Date Format', 'google-calendar-events' ); ?></label></th>
592
+				<th><label for="_calendar_date_format_setting"><?php _e('Date Format', 'google-calendar-events'); ?></label></th>
593 593
 				<td>
594 594
 					<?php
595 595
 
596
-					$date_format_setting = esc_attr( get_post_meta( $post->ID, '_calendar_date_format_setting', true ) );
597
-					$date_format_default = esc_attr( get_option( 'date_format' ) );
598
-					$date_format = esc_attr( get_post_meta( $post->ID, '_calendar_date_format', true ) );
599
-					$date_format_php = esc_attr( get_post_meta( $post->ID, '_calendar_date_format_php', true ) );
596
+					$date_format_setting = esc_attr(get_post_meta($post->ID, '_calendar_date_format_setting', true));
597
+					$date_format_default = esc_attr(get_option('date_format'));
598
+					$date_format = esc_attr(get_post_meta($post->ID, '_calendar_date_format', true));
599
+					$date_format_php = esc_attr(get_post_meta($post->ID, '_calendar_date_format_php', true));
600 600
 					$date_format_php = $date_format_php ? $date_format_php : $date_format_default;
601 601
 
602 602
 					?>
603 603
 					<select name="_calendar_date_format_setting"
604 604
 							id="_calendar_date_format_setting"
605 605
 							class="simcal-field simcal-field-select simcal-field-show-other">
606
-						<option value="use_site" data-show-field="_calendar_date_format_default" <?php selected( 'use_site', $date_format_setting, true ); ?>><?php  _ex( 'Site default', 'Use this site default setting', 'google-calendar-events' ); ?></option>
607
-						<option value="use_custom" data-show-field="_calendar_date_format" <?php selected( 'use_custom', $date_format_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
608
-						<option value="use_custom_php" data-show-field="_calendar_date_format_php_field" <?php selected( 'use_custom_php', $date_format_setting, true ); ?>><?php _e( 'Custom (PHP format)', 'google-calendar-events' ); ?></option>
606
+						<option value="use_site" data-show-field="_calendar_date_format_default" <?php selected('use_site', $date_format_setting, true); ?>><?php  _ex('Site default', 'Use this site default setting', 'google-calendar-events'); ?></option>
607
+						<option value="use_custom" data-show-field="_calendar_date_format" <?php selected('use_custom', $date_format_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
608
+						<option value="use_custom_php" data-show-field="_calendar_date_format_php_field" <?php selected('use_custom_php', $date_format_setting, true); ?>><?php _e('Custom (PHP format)', 'google-calendar-events'); ?></option>
609 609
 					</select>
610
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'This option sets how calendars display event dates. It is recommended to keep your site default setting.', 'google-calendar-events' ); ?>"></i>
610
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('This option sets how calendars display event dates. It is recommended to keep your site default setting.', 'google-calendar-events'); ?>"></i>
611 611
 					<p id="_calendar_date_format_default" style="<?php echo $date_format_setting != 'use_site' ? 'display: none;' : ''; ?>">
612
-						<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
613
-						<code><?php echo date_i18n( $date_format_default, time() ); ?></code>
612
+						<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
613
+						<code><?php echo date_i18n($date_format_default, time()); ?></code>
614 614
 					</p>
615
-					<?php simcal_print_field( array(
615
+					<?php simcal_print_field(array(
616 616
 						'type'    => 'datetime-format',
617 617
 						'subtype' => 'date',
618 618
 						'name'    => '_calendar_date_format',
619 619
 						'id'      => '_calendar_date_format',
620 620
 						'value'   => $date_format,
621
-						'style'   => $date_format_setting != 'use_custom' ? array( 'display' => 'none' ) : '',
622
-					) ); ?>
621
+						'style'   => $date_format_setting != 'use_custom' ? array('display' => 'none') : '',
622
+					)); ?>
623 623
 					<div class="simcal-field-datetime-format-php" id="_calendar_date_format_php_field" style="<?php echo $date_format_setting != 'use_custom_php' ? 'display: none;' : ''; ?>">
624 624
 						<br>
625 625
 						<label for="_calendar_date_format_php">
@@ -628,70 +628,70 @@  discard block
 block discarded – undo
628 628
 								   id="_calendar_date_format_php"
629 629
 								   class="simcal-field simcal-field-text simcal-field-small"
630 630
 								   value="<?php echo $date_format_php; ?>" />
631
-							<?php printf( __( 'Enter a date format using %s values.', 'google-calendar-events' ), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>' ); ?>
631
+							<?php printf(__('Enter a date format using %s values.', 'google-calendar-events'), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>'); ?>
632 632
 						</label>
633 633
 						<p>
634
-							<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
635
-							<code><?php echo date_i18n( $date_format_php, time() ); ?></code>
634
+							<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
635
+							<code><?php echo date_i18n($date_format_php, time()); ?></code>
636 636
 						</p>
637 637
 					</div>
638 638
 				</td>
639 639
 			</tr>
640 640
 			<tr class="simcal-panel-field">
641
-				<th><label for="_calendar_datetime_separator"><?php _e( 'Separator', 'google-calendar-events' ); ?></label></th>
641
+				<th><label for="_calendar_datetime_separator"><?php _e('Separator', 'google-calendar-events'); ?></label></th>
642 642
 				<td>
643 643
 					<?php
644 644
 
645
-					$separator = get_post_meta( $post->ID, '_calendar_datetime_separator', true );
645
+					$separator = get_post_meta($post->ID, '_calendar_datetime_separator', true);
646 646
 					$separator = false == $separator ? '@' : $separator;
647 647
 
648
-					simcal_print_field( array(
648
+					simcal_print_field(array(
649 649
 						'type'    => 'standard',
650 650
 						'subtype' => 'text',
651 651
 						'name'    => '_calendar_datetime_separator',
652 652
 						'id'      => '_calendar_datetime_separator',
653 653
 						'value'   => $separator,
654
-						'tooltip' => __( 'Used to divide date and time when both are shown.', 'google-calendar-events' ),
654
+						'tooltip' => __('Used to divide date and time when both are shown.', 'google-calendar-events'),
655 655
 						'class'   => array(
656 656
 							'simcal-field-tiny',
657 657
 						),
658
-					) );
658
+					));
659 659
 
660 660
 					?>
661 661
 				</td>
662 662
 			</tr>
663 663
 			<tr class="simcal-panel-field">
664
-				<th><label for="_calendar_time_format_setting"><?php _e( 'Time Format', 'google-calendar-events' ); ?></label></th>
664
+				<th><label for="_calendar_time_format_setting"><?php _e('Time Format', 'google-calendar-events'); ?></label></th>
665 665
 				<td>
666 666
 					<?php
667 667
 
668
-					$time_format_setting = esc_attr( get_post_meta( $post->ID, '_calendar_time_format_setting', true ) );
669
-					$time_format_default = esc_attr( get_option( 'time_format' ) );
670
-					$time_format = esc_attr( get_post_meta( $post->ID, '_calendar_time_format', true ) );
671
-					$time_format_php = esc_attr( get_post_meta( $post->ID, '_calendar_time_format_php', true ) );
668
+					$time_format_setting = esc_attr(get_post_meta($post->ID, '_calendar_time_format_setting', true));
669
+					$time_format_default = esc_attr(get_option('time_format'));
670
+					$time_format = esc_attr(get_post_meta($post->ID, '_calendar_time_format', true));
671
+					$time_format_php = esc_attr(get_post_meta($post->ID, '_calendar_time_format_php', true));
672 672
 					$time_format_php = $time_format_php ? $time_format_php : $time_format_default;
673 673
 
674 674
 					?>
675 675
 					<select name="_calendar_time_format_setting"
676 676
 							id="_calendar_time_format_setting"
677 677
 							class="simcal-field simcal-field-select simcal-field-show-other">
678
-						<option value="use_site" data-show-field="_calendar_time_format_default" <?php selected( 'use_site', $time_format_setting, true ); ?>><?php _ex( 'Site default', 'Use this site default setting', 'google-calendar-events' ); ?></option>
679
-						<option value="use_custom" data-show-field="_calendar_time_format" <?php selected( 'use_custom', $time_format_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
680
-						<option value="use_custom_php" data-show-field="_calendar_time_format_php_field" <?php selected( 'use_custom_php', $time_format_setting, true ); ?>><?php _e( 'Custom (PHP format)', 'google-calendar-events' ); ?></option>
678
+						<option value="use_site" data-show-field="_calendar_time_format_default" <?php selected('use_site', $time_format_setting, true); ?>><?php _ex('Site default', 'Use this site default setting', 'google-calendar-events'); ?></option>
679
+						<option value="use_custom" data-show-field="_calendar_time_format" <?php selected('use_custom', $time_format_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
680
+						<option value="use_custom_php" data-show-field="_calendar_time_format_php_field" <?php selected('use_custom_php', $time_format_setting, true); ?>><?php _e('Custom (PHP format)', 'google-calendar-events'); ?></option>
681 681
 					</select>
682
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'This option sets how calendars display event times. It is recommended to keep your site default setting.', 'google-calendar-events' ); ?>"></i>
682
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('This option sets how calendars display event times. It is recommended to keep your site default setting.', 'google-calendar-events'); ?>"></i>
683 683
 					<p id="_calendar_time_format_default" style="<?php echo $time_format_setting != 'use_site' ? 'display: none;' : ''; ?>">
684
-						<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
685
-						<code><?php echo date_i18n( $time_format_default, time() ); ?></code>
684
+						<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
685
+						<code><?php echo date_i18n($time_format_default, time()); ?></code>
686 686
 					</p>
687
-					<?php simcal_print_field( array(
687
+					<?php simcal_print_field(array(
688 688
 						'type'    => 'datetime-format',
689 689
 						'subtype' => 'time',
690 690
 						'name'    => '_calendar_time_format',
691 691
 						'id'      => '_calendar_time_format',
692 692
 						'value'   => $time_format,
693
-						'style'   => $time_format_setting != 'use_custom' ? array( 'display' => 'none' ) : '',
694
-					) ); ?>
693
+						'style'   => $time_format_setting != 'use_custom' ? array('display' => 'none') : '',
694
+					)); ?>
695 695
 					<div class="simcal-field-datetime-format-php" id="_calendar_time_format_php_field" style="<?php echo $time_format_setting != 'use_custom_php' ? 'display: none;' : ''; ?>">
696 696
 						<br>
697 697
 						<label for="_calendar_date_format_php">
@@ -700,24 +700,24 @@  discard block
 block discarded – undo
700 700
 								   id="_calendar_time_format_php"
701 701
 								   class="simcal-field simcal-field-text simcal-field-small"
702 702
 								   value="<?php echo $time_format_php; ?>"/>
703
-							<?php printf( __( 'Enter a time format using %s values.', 'google-calendar-events' ), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>' ); ?>
703
+							<?php printf(__('Enter a time format using %s values.', 'google-calendar-events'), '<a href="//php.net/manual/en/function.date.php" target="_blank">PHP</a>'); ?>
704 704
 						</label>
705 705
 						<p>
706
-							<em><?php _e( 'Preview', 'google-calendar-events' ) ?>:</em>&nbsp;&nbsp;
707
-							<code><?php echo date_i18n( $time_format_php, time() ); ?></code>
706
+							<em><?php _e('Preview', 'google-calendar-events') ?>:</em>&nbsp;&nbsp;
707
+							<code><?php echo date_i18n($time_format_php, time()); ?></code>
708 708
 						</p>
709 709
 					</div>
710 710
 				</td>
711 711
 			</tr>
712 712
 			<tr class="simcal-panel-field">
713
-				<th><label for="_calendar_week_starts_on_setting"><?php _e( 'Week Starts On', 'google-calendar-events' ); ?></label></th>
713
+				<th><label for="_calendar_week_starts_on_setting"><?php _e('Week Starts On', 'google-calendar-events'); ?></label></th>
714 714
 				<td>
715 715
 					<?php
716 716
 
717
-					$week_starts_setting = esc_attr( get_post_meta( $post->ID, '_calendar_week_starts_on_setting', true ) );
718
-					$week_starts_default = esc_attr( get_option( 'start_of_week' ) );
719
-					$week_starts = intval( get_post_meta( $post->ID, '_calendar_week_starts_on', true ) );
720
-					$week_starts = is_numeric( $week_starts ) ? strval( $week_starts ) : $week_starts_default;
717
+					$week_starts_setting = esc_attr(get_post_meta($post->ID, '_calendar_week_starts_on_setting', true));
718
+					$week_starts_default = esc_attr(get_option('start_of_week'));
719
+					$week_starts = intval(get_post_meta($post->ID, '_calendar_week_starts_on', true));
720
+					$week_starts = is_numeric($week_starts) ? strval($week_starts) : $week_starts_default;
721 721
 
722 722
 					?>
723 723
 					<select
@@ -725,40 +725,40 @@  discard block
 block discarded – undo
725 725
 						id="_calendar_week_starts_on_setting"
726 726
 						class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-next"
727 727
 						data-show-next-if-value="use_custom">
728
-						<option value="use_site" <?php selected( 'use_site', $week_starts_setting, true ); ?>><?php printf( _x( 'Site default', 'Use this site default setting', 'google-calendar-events' ) . ' (%s)', date_i18n( 'l', strtotime( "Sunday + $week_starts_default Days" ) ) ); ?></option>
729
-						<option value="use_custom" <?php selected( 'use_custom', $week_starts_setting, true ); ?>><?php _ex( 'Custom', 'Use a custom setting', 'google-calendar-events' ); ?></option>
728
+						<option value="use_site" <?php selected('use_site', $week_starts_setting, true); ?>><?php printf(_x('Site default', 'Use this site default setting', 'google-calendar-events').' (%s)', date_i18n('l', strtotime("Sunday + $week_starts_default Days"))); ?></option>
729
+						<option value="use_custom" <?php selected('use_custom', $week_starts_setting, true); ?>><?php _ex('Custom', 'Use a custom setting', 'google-calendar-events'); ?></option>
730 730
 					</select>
731 731
 					<select
732 732
 						name="_calendar_week_starts_on"
733 733
 						id="_calendar_week_starts_on"
734 734
 						class="simcal-field simcal-field-select simcal-field-inline"
735 735
 						<?php echo 'use_custom' != $week_starts_setting ? 'style="display: none;"' : ''; ?>>
736
-						<?php $day_names = simcal_get_calendar_names_i18n( 'day', 'full' ); ?>
737
-						<?php for ( $i = 0; $i <= 6; $i++ ) : ?>
738
-							<option value="<?php echo $i; ?>" <?php selected( $i, $week_starts, true ); ?>><?php echo $day_names[ $i ]; ?></option>
736
+						<?php $day_names = simcal_get_calendar_names_i18n('day', 'full'); ?>
737
+						<?php for ($i = 0; $i <= 6; $i++) : ?>
738
+							<option value="<?php echo $i; ?>" <?php selected($i, $week_starts, true); ?>><?php echo $day_names[$i]; ?></option>
739 739
 						<?php endfor; ?>
740 740
 					</select>
741
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Some calendars may use this setting to display the start of the week. It is recommended to keep the site default setting.', 'google-calendar-events' ); ?>"></i>
741
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Some calendars may use this setting to display the start of the week. It is recommended to keep the site default setting.', 'google-calendar-events'); ?>"></i>
742 742
 				</td>
743 743
 			</tr>
744 744
 			</tbody>
745 745
 		</table>
746 746
 		<table>
747 747
 			<thead>
748
-			<tr><th colspan="2"><?php _e( 'Cache', 'google-calendar-events' ); ?></th></tr>
748
+			<tr><th colspan="2"><?php _e('Cache', 'google-calendar-events'); ?></th></tr>
749 749
 			</thead>
750 750
 			<tbody class="simcal-panel-section simcal-panel-section-cache">
751 751
 			<?php
752 752
 
753
-			$cache_freq = esc_attr( get_post_meta( $post->ID, '_feed_cache_user_amount', true ) );
754
-			$cache_unit = esc_attr( get_post_meta( $post->ID, '_feed_cache_user_unit', true ) );
753
+			$cache_freq = esc_attr(get_post_meta($post->ID, '_feed_cache_user_amount', true));
754
+			$cache_unit = esc_attr(get_post_meta($post->ID, '_feed_cache_user_unit', true));
755 755
 
756
-			$cache_freq = intval( $cache_freq ) && $cache_freq >= 0 ? $cache_freq : 2;
756
+			$cache_freq = intval($cache_freq) && $cache_freq >= 0 ? $cache_freq : 2;
757 757
 			$cache_unit = $cache_unit ? $cache_unit : '3600';
758 758
 
759 759
 			?>
760 760
 			<tr class="simcal-panel-field">
761
-				<th><label for="_feed_cache_user_amount"><?php _ex( 'Refresh Interval', 'Cache maximum interval', 'google-calendar-events' ); ?></label></th>
761
+				<th><label for="_feed_cache_user_amount"><?php _ex('Refresh Interval', 'Cache maximum interval', 'google-calendar-events'); ?></label></th>
762 762
 				<td>
763 763
 					<input type="number"
764 764
 						   name="_feed_cache_user_amount"
@@ -769,12 +769,12 @@  discard block
 block discarded – undo
769 769
 					<select name="_feed_cache_user_unit"
770 770
 							id="_feed_cache_user_unit"
771 771
 							class="simcal-field simcalfield-select simcal-field-inline">
772
-						<option value="60" <?php selected( '60', $cache_unit, true ); ?>><?php _e( 'Minute(s)', 'google-calendar-events' ); ?></option>
773
-						<option value="3600" <?php selected( '3600', $cache_unit, true ); ?>><?php _e( 'Hour(s)', 'google-calendar-events' ); ?></option>
774
-						<option value="86400" <?php selected( '86400', $cache_unit, true ); ?>><?php _e( 'Day(s)', 'google-calendar-events' ); ?></option>
775
-						<option value="604800" <?php selected( '604800', $cache_unit, true ); ?>><?php _e( 'Week(s)', 'google-calendar-events' ); ?></option>
772
+						<option value="60" <?php selected('60', $cache_unit, true); ?>><?php _e('Minute(s)', 'google-calendar-events'); ?></option>
773
+						<option value="3600" <?php selected('3600', $cache_unit, true); ?>><?php _e('Hour(s)', 'google-calendar-events'); ?></option>
774
+						<option value="86400" <?php selected('86400', $cache_unit, true); ?>><?php _e('Day(s)', 'google-calendar-events'); ?></option>
775
+						<option value="604800" <?php selected('604800', $cache_unit, true); ?>><?php _e('Week(s)', 'google-calendar-events'); ?></option>
776 776
 					</select>
777
-					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'If you add, edit or remove events in your calendar very often, you can set a lower interval to refresh the events displayed. Set a higher interval for best performance.', 'google-calendar-events' ); ?>"></i>
777
+					<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('If you add, edit or remove events in your calendar very often, you can set a lower interval to refresh the events displayed. Set a higher interval for best performance.', 'google-calendar-events'); ?>"></i>
778 778
 				</td>
779 779
 			</tr>
780 780
 			</tbody>
@@ -793,21 +793,21 @@  discard block
 block discarded – undo
793 793
 	 *
794 794
 	 * @return void
795 795
 	 */
796
-	public static function print_panel_fields( $array, $post_id ) {
796
+	public static function print_panel_fields($array, $post_id) {
797 797
 
798
-		foreach ( $array as $section => $fields ) :
798
+		foreach ($array as $section => $fields) :
799 799
 
800
-			if ( $fields && is_array( $fields ) ) :
800
+			if ($fields && is_array($fields)) :
801 801
 
802 802
 				?>
803
-				<tbody class="simcal-panel-section simcal-panel-section-<?php echo esc_attr( $section ); ?>">
804
-				<?php foreach ( $fields as $key => $field ) :
803
+				<tbody class="simcal-panel-section simcal-panel-section-<?php echo esc_attr($section); ?>">
804
+				<?php foreach ($fields as $key => $field) :
805 805
 
806
-					$value            = get_post_meta( $post_id, $key, true );
807
-					$field['value']   = $value ? $value : ( isset( $field['default'] ) ? $field['default'] : '' );
808
-					$the_field = simcal_get_field( $field ); ?>
806
+					$value            = get_post_meta($post_id, $key, true);
807
+					$field['value']   = $value ? $value : (isset($field['default']) ? $field['default'] : '');
808
+					$the_field = simcal_get_field($field); ?>
809 809
 
810
-					<?php if ( $the_field instanceof Field ) : ?>
810
+					<?php if ($the_field instanceof Field) : ?>
811 811
 					<tr class="simcal-panel-field">
812 812
 						<th><label for="<?php echo $the_field->id ?>"><?php echo $the_field->title; ?></label></th>
813 813
 						<td><?php $the_field->html(); ?></td>
@@ -834,30 +834,30 @@  discard block
 block discarded – undo
834 834
 	 *
835 835
 	 * @return void
836 836
 	 */
837
-	public static function save( $post_id, $post ) {
837
+	public static function save($post_id, $post) {
838 838
 
839 839
 		/* ====================== *
840 840
 		 * Calendar type and view *
841 841
 		 * ====================== */
842 842
 
843 843
 		// Unlink existing terms for feed type and calendar type.
844
-		wp_delete_object_term_relationships( $post_id, array(
844
+		wp_delete_object_term_relationships($post_id, array(
845 845
 			'calendar_feed',
846 846
 			'calendar_type',
847
-		) );
847
+		));
848 848
 
849 849
 		// Set the feed type as term.
850
-		$feed_type = isset( $_POST['_feed_type'] ) ? sanitize_title( stripslashes( $_POST['_feed_type'] ) ) : apply_filters( 'simcal_default_feed_type', 'google' );
851
-		wp_set_object_terms( $post_id, $feed_type, 'calendar_feed' );
850
+		$feed_type = isset($_POST['_feed_type']) ? sanitize_title(stripslashes($_POST['_feed_type'])) : apply_filters('simcal_default_feed_type', 'google');
851
+		wp_set_object_terms($post_id, $feed_type, 'calendar_feed');
852 852
 
853 853
 		// Set the calendar type as a term.
854
-		$calendar_type = isset( $_POST['_calendar_type'] ) ? sanitize_title( stripslashes( $_POST['_calendar_type'] ) ) : apply_filters( 'simcal_default_calendar_type', 'default-calendar' );
855
-		wp_set_object_terms( $post_id, $calendar_type, 'calendar_type' );
854
+		$calendar_type = isset($_POST['_calendar_type']) ? sanitize_title(stripslashes($_POST['_calendar_type'])) : apply_filters('simcal_default_calendar_type', 'default-calendar');
855
+		wp_set_object_terms($post_id, $calendar_type, 'calendar_type');
856 856
 		// Set the calendar type view as post meta.
857
-		$calendar_view = isset( $_POST['_calendar_view'] ) ? $_POST['_calendar_view'] : '';
858
-		if ( $calendar_view && is_array( $calendar_view ) ) {
859
-			$views = array_map( 'sanitize_title', $calendar_view );
860
-			update_post_meta( $post_id, '_calendar_view', $views );
857
+		$calendar_view = isset($_POST['_calendar_view']) ? $_POST['_calendar_view'] : '';
858
+		if ($calendar_view && is_array($calendar_view)) {
859
+			$views = array_map('sanitize_title', $calendar_view);
860
+			update_post_meta($post_id, '_calendar_view', $views);
861 861
 		}
862 862
 
863 863
 		/* ===================== *
@@ -865,106 +865,106 @@  discard block
 block discarded – undo
865 865
 		 * ===================== */
866 866
 
867 867
 		// Calendar opening.
868
-		$calendar_begins = isset( $_POST['_calendar_begins'] ) ? sanitize_key( $_POST['_calendar_begins'] ) : 'this_month';
869
-		update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
870
-		$calendar_begins_nth = isset( $_POST['_calendar_begins_nth'] ) ? absint( $_POST['_calendar_begins_nth'] ) : 2;
871
-		update_post_meta( $post_id, '_calendar_begins_nth', $calendar_begins_nth );
872
-		$calendar_begins_custom_date = isset( $_POST['_calendar_begins_custom_date'] ) ? sanitize_title( $_POST['_calendar_begins_custom_date'] ) : '';
873
-		update_post_meta( $post_id, '_calendar_begins_custom_date', $calendar_begins_custom_date );
868
+		$calendar_begins = isset($_POST['_calendar_begins']) ? sanitize_key($_POST['_calendar_begins']) : 'this_month';
869
+		update_post_meta($post_id, '_calendar_begins', $calendar_begins);
870
+		$calendar_begins_nth = isset($_POST['_calendar_begins_nth']) ? absint($_POST['_calendar_begins_nth']) : 2;
871
+		update_post_meta($post_id, '_calendar_begins_nth', $calendar_begins_nth);
872
+		$calendar_begins_custom_date = isset($_POST['_calendar_begins_custom_date']) ? sanitize_title($_POST['_calendar_begins_custom_date']) : '';
873
+		update_post_meta($post_id, '_calendar_begins_custom_date', $calendar_begins_custom_date);
874 874
 
875 875
 		// Feed earliest events date.
876
-		$earliest_events = isset( $_POST['_feed_earliest_event_date'] ) ? sanitize_key( $_POST['_feed_earliest_event_date'] ) : '';
877
-		update_post_meta( $post_id, '_feed_earliest_event_date', $earliest_events );
878
-		$earliest_events_range = isset( $_POST['_feed_earliest_event_date_range'] ) ? max( absint( $_POST['_feed_earliest_event_date_range'] ), 1 ) : 1;
879
-		update_post_meta( $post_id, '_feed_earliest_event_date_range', $earliest_events_range );
876
+		$earliest_events = isset($_POST['_feed_earliest_event_date']) ? sanitize_key($_POST['_feed_earliest_event_date']) : '';
877
+		update_post_meta($post_id, '_feed_earliest_event_date', $earliest_events);
878
+		$earliest_events_range = isset($_POST['_feed_earliest_event_date_range']) ? max(absint($_POST['_feed_earliest_event_date_range']), 1) : 1;
879
+		update_post_meta($post_id, '_feed_earliest_event_date_range', $earliest_events_range);
880 880
 
881 881
 		// Feed latest events date.
882
-		$latest_events = isset( $_POST['_feed_latest_event_date'] ) ? sanitize_key( $_POST['_feed_latest_event_date'] ) : '';
883
-		update_post_meta( $post_id, '_feed_latest_event_date', $latest_events );
884
-		$latest_events_range = isset( $_POST['_feed_latest_event_date_range'] ) ? max( absint( $_POST['_feed_latest_event_date_range'] ), 1 ) : 1;
885
-		update_post_meta( $post_id, '_feed_latest_event_date_range', $latest_events_range );
882
+		$latest_events = isset($_POST['_feed_latest_event_date']) ? sanitize_key($_POST['_feed_latest_event_date']) : '';
883
+		update_post_meta($post_id, '_feed_latest_event_date', $latest_events);
884
+		$latest_events_range = isset($_POST['_feed_latest_event_date_range']) ? max(absint($_POST['_feed_latest_event_date_range']), 1) : 1;
885
+		update_post_meta($post_id, '_feed_latest_event_date_range', $latest_events_range);
886 886
 
887 887
 		/* ======================= *
888 888
 		 * Calendar settings panel *
889 889
 		 * ======================= */
890 890
 
891 891
 		// Static calendar.
892
-		$static = isset( $_POST['_calendar_is_static'] ) ? 'yes' : 'no';
893
-		update_post_meta( $post_id, '_calendar_is_static', $static );
892
+		$static = isset($_POST['_calendar_is_static']) ? 'yes' : 'no';
893
+		update_post_meta($post_id, '_calendar_is_static', $static);
894 894
 
895 895
 		// No events message.
896
-		$message = isset( $_POST['_no_events_message'] ) ? wp_kses_post( $_POST['_no_events_message'] ) : '';
897
-		update_post_meta( $post_id, '_no_events_message', $message );
896
+		$message = isset($_POST['_no_events_message']) ? wp_kses_post($_POST['_no_events_message']) : '';
897
+		update_post_meta($post_id, '_no_events_message', $message);
898 898
 
899 899
 		// _event_formatting
900
-		$event_formatting = isset( $_POST['_event_formatting'] ) ? sanitize_key( $_POST['_event_formatting'] ) : 'preserve_linebreaks';
901
-		update_post_meta( $post_id, '_event_formatting', $event_formatting );
900
+		$event_formatting = isset($_POST['_event_formatting']) ? sanitize_key($_POST['_event_formatting']) : 'preserve_linebreaks';
901
+		update_post_meta($post_id, '_event_formatting', $event_formatting);
902 902
 
903 903
 		// Powered by option
904
-		$poweredby = isset( $_POST['_poweredby'] ) ? 'yes' : 'no';
905
-		update_post_meta( $post_id, '_poweredby', $poweredby );
904
+		$poweredby = isset($_POST['_poweredby']) ? 'yes' : 'no';
905
+		update_post_meta($post_id, '_poweredby', $poweredby);
906 906
 
907 907
 		/* ======================= *
908 908
 		 * Advanced settings panel *
909 909
 		 * ======================= */
910 910
 
911 911
 		// Timezone.
912
-		$feed_timezone_setting = isset( $_POST['_feed_timezone_setting'] ) ? sanitize_key( $_POST['_feed_timezone_setting'] ) : 'use_calendar';
913
-		update_post_meta( $post_id, '_feed_timezone_setting', $feed_timezone_setting );
912
+		$feed_timezone_setting = isset($_POST['_feed_timezone_setting']) ? sanitize_key($_POST['_feed_timezone_setting']) : 'use_calendar';
913
+		update_post_meta($post_id, '_feed_timezone_setting', $feed_timezone_setting);
914 914
 		$default_timezone = simcal_get_wp_timezone();
915 915
 		$feed_timezone = $default_timezone ? $default_timezone : 'UTC';
916
-		$feed_timezone = isset( $_POST['_feed_timezone'] ) ? sanitize_text_field( $_POST['_feed_timezone'] ) : $feed_timezone;
917
-		update_post_meta( $post_id, '_feed_timezone', $feed_timezone );
916
+		$feed_timezone = isset($_POST['_feed_timezone']) ? sanitize_text_field($_POST['_feed_timezone']) : $feed_timezone;
917
+		update_post_meta($post_id, '_feed_timezone', $feed_timezone);
918 918
 
919 919
 		// Date format.
920
-		$date_format_setting = isset( $_POST['_calendar_date_format_setting'] ) ? sanitize_key( $_POST['_calendar_date_format_setting'] ) : 'use_site';
921
-		update_post_meta( $post_id, '_calendar_date_format_setting', $date_format_setting );
922
-		$date_format = isset( $_POST['_calendar_date_format'] ) ? sanitize_text_field( trim( $_POST['_calendar_date_format'] ) ) : get_option( 'date_format' );
923
-		update_post_meta( $post_id, '_calendar_date_format', $date_format );
924
-		$date_format_php = isset( $_POST['_calendar_date_format_php'] ) ? sanitize_text_field( trim( $_POST['_calendar_date_format_php'] ) ) : get_option( 'date_format' );
925
-		update_post_meta( $post_id, '_calendar_date_format_php', $date_format_php );
920
+		$date_format_setting = isset($_POST['_calendar_date_format_setting']) ? sanitize_key($_POST['_calendar_date_format_setting']) : 'use_site';
921
+		update_post_meta($post_id, '_calendar_date_format_setting', $date_format_setting);
922
+		$date_format = isset($_POST['_calendar_date_format']) ? sanitize_text_field(trim($_POST['_calendar_date_format'])) : get_option('date_format');
923
+		update_post_meta($post_id, '_calendar_date_format', $date_format);
924
+		$date_format_php = isset($_POST['_calendar_date_format_php']) ? sanitize_text_field(trim($_POST['_calendar_date_format_php'])) : get_option('date_format');
925
+		update_post_meta($post_id, '_calendar_date_format_php', $date_format_php);
926 926
 
927 927
 		// Time format.
928
-		$time_format_setting = isset( $_POST['_calendar_time_format_setting'] ) ? sanitize_key( $_POST['_calendar_time_format_setting'] ) : 'use_site';
929
-		update_post_meta( $post_id, '_calendar_time_format_setting', $time_format_setting );
930
-		$time_format = isset( $_POST['_calendar_time_format'] ) ? sanitize_text_field( trim( $_POST['_calendar_time_format'] ) ) : get_option( 'time_format' );
931
-		update_post_meta( $post_id, '_calendar_time_format', $time_format );
932
-		$time_format_php = isset( $_POST['_calendar_time_format_php'] ) ? sanitize_text_field( trim( $_POST['_calendar_time_format_php'] ) ) : get_option( 'time_format' );
933
-		update_post_meta( $post_id, '_calendar_time_format_php', $time_format_php );
928
+		$time_format_setting = isset($_POST['_calendar_time_format_setting']) ? sanitize_key($_POST['_calendar_time_format_setting']) : 'use_site';
929
+		update_post_meta($post_id, '_calendar_time_format_setting', $time_format_setting);
930
+		$time_format = isset($_POST['_calendar_time_format']) ? sanitize_text_field(trim($_POST['_calendar_time_format'])) : get_option('time_format');
931
+		update_post_meta($post_id, '_calendar_time_format', $time_format);
932
+		$time_format_php = isset($_POST['_calendar_time_format_php']) ? sanitize_text_field(trim($_POST['_calendar_time_format_php'])) : get_option('time_format');
933
+		update_post_meta($post_id, '_calendar_time_format_php', $time_format_php);
934 934
 
935 935
 		// Date-time separator.
936
-		$datetime_separator = isset( $_POST['_calendar_datetime_separator'] ) ? sanitize_text_field( $_POST['_calendar_datetime_separator'] ) : ' ';
937
-		update_post_meta( $post_id, '_calendar_datetime_separator', $datetime_separator );
936
+		$datetime_separator = isset($_POST['_calendar_datetime_separator']) ? sanitize_text_field($_POST['_calendar_datetime_separator']) : ' ';
937
+		update_post_meta($post_id, '_calendar_datetime_separator', $datetime_separator);
938 938
 
939 939
 		// Week start.
940
-		$week_start_setting = isset( $_POST['_calendar_week_starts_on_setting'] ) ? sanitize_key( $_POST['_calendar_week_starts_on_setting'] ) : 'use_site';
941
-		update_post_meta( $post_id, '_calendar_week_starts_on_setting', $week_start_setting );
942
-		$week_start = isset( $_POST['_calendar_week_starts_on'] ) ? intval( $_POST['_calendar_week_starts_on'] ) : get_option( 'start_of_week' );
943
-		update_post_meta( $post_id, '_calendar_week_starts_on', $week_start );
940
+		$week_start_setting = isset($_POST['_calendar_week_starts_on_setting']) ? sanitize_key($_POST['_calendar_week_starts_on_setting']) : 'use_site';
941
+		update_post_meta($post_id, '_calendar_week_starts_on_setting', $week_start_setting);
942
+		$week_start = isset($_POST['_calendar_week_starts_on']) ? intval($_POST['_calendar_week_starts_on']) : get_option('start_of_week');
943
+		update_post_meta($post_id, '_calendar_week_starts_on', $week_start);
944 944
 
945 945
 		// Cache interval.
946 946
 		$cache = 7200;
947
-		if ( isset( $_POST['_feed_cache_user_amount'] ) && isset( $_POST['_feed_cache_user_unit'] ) ) {
948
-			$amount = is_numeric( $_POST['_feed_cache_user_amount'] ) || $_POST['_feed_cache_user_amount'] == 0 ? absint( $_POST['_feed_cache_user_amount'] ) : 1;
949
-			$unit   = is_numeric( $_POST['_feed_cache_user_unit'] ) ? absint( $_POST['_feed_cache_user_unit'] ) : 3600;
950
-			update_post_meta( $post_id, '_feed_cache_user_amount', $amount );
951
-			update_post_meta( $post_id, '_feed_cache_user_unit', $unit );
952
-			$cache  = ( ( $amount * $unit ) > 0 ) ? $amount * $unit : 1;
947
+		if (isset($_POST['_feed_cache_user_amount']) && isset($_POST['_feed_cache_user_unit'])) {
948
+			$amount = is_numeric($_POST['_feed_cache_user_amount']) || $_POST['_feed_cache_user_amount'] == 0 ? absint($_POST['_feed_cache_user_amount']) : 1;
949
+			$unit   = is_numeric($_POST['_feed_cache_user_unit']) ? absint($_POST['_feed_cache_user_unit']) : 3600;
950
+			update_post_meta($post_id, '_feed_cache_user_amount', $amount);
951
+			update_post_meta($post_id, '_feed_cache_user_unit', $unit);
952
+			$cache  = (($amount * $unit) > 0) ? $amount * $unit : 1;
953 953
 		}
954
-		update_post_meta( $post_id, '_feed_cache', $cache );
954
+		update_post_meta($post_id, '_feed_cache', $cache);
955 955
 
956 956
 		/* ============= *
957 957
 		 * Miscellaneous *
958 958
 		 * ============= */
959 959
 
960 960
 		// Update version.
961
-		update_post_meta( $post_id, '_calendar_version', SIMPLE_CALENDAR_VERSION );
961
+		update_post_meta($post_id, '_calendar_version', SIMPLE_CALENDAR_VERSION);
962 962
 
963 963
 		// Action hook.
964
-		do_action( 'simcal_process_settings_meta', $post_id );
964
+		do_action('simcal_process_settings_meta', $post_id);
965 965
 
966 966
 		// Clear cache.
967
-		simcal_delete_feed_transients( $post_id );
967
+		simcal_delete_feed_transients($post_id);
968 968
 	}
969 969
 
970 970
 }
Please login to merge, or discard this patch.
includes/admin/pages/system-status.php 1 patch
Spacing   +168 added lines, -168 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 use SimpleCalendar\Abstracts\Admin_Page;
10 10
 
11
-if ( ! defined( 'ABSPATH' ) ) {
11
+if ( ! defined('ABSPATH')) {
12 12
 	exit;
13 13
 }
14 14
 
@@ -30,16 +30,16 @@  discard block
 block discarded – undo
30 30
 
31 31
 		$this->id           = $tab = 'system-status';
32 32
 		$this->option_group = $page = 'tools';
33
-		$this->label        = __( 'System Report', 'google-calendar-events' );
33
+		$this->label        = __('System Report', 'google-calendar-events');
34 34
 		$this->description  = '';
35 35
 		$this->sections     = $this->add_sections();
36 36
 		$this->fields       = $this->add_fields();
37 37
 
38 38
 		// Disable the submit button for this page.
39
-		add_filter( 'simcal_admin_page_' . $page . '_' . $tab . '_submit', function() { return false; } );
39
+		add_filter('simcal_admin_page_'.$page.'_'.$tab.'_submit', function() { return false; } );
40 40
 
41 41
 		// Add html.
42
-		add_action( 'simcal_admin_page_' . $page . '_' . $tab . '_end', array( $this, 'html' ) );
42
+		add_action('simcal_admin_page_'.$page.'_'.$tab.'_end', array($this, 'html'));
43 43
 	}
44 44
 
45 45
 	/**
@@ -51,37 +51,37 @@  discard block
 block discarded – undo
51 51
 
52 52
 		?>
53 53
 		<div id="simcal-system-status-report">
54
-			<p><?php _e( 'Please copy and paste this information when contacting support:', 'google-calendar-events' ); ?> </p>
54
+			<p><?php _e('Please copy and paste this information when contacting support:', 'google-calendar-events'); ?> </p>
55 55
 			<textarea readonly="readonly" onclick="this.select();"></textarea>
56
-			<p><?php _e( 'You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events' ); ?></p>
57
-			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e( 'Download System Report', 'google-calendar-events' ); ?></a></p>
56
+			<p><?php _e('You can also download your information as a text file to attach, or simply view it below.', 'google-calendar-events'); ?></p>
57
+			<p><a href="#" id="simcal-system-status-report-download" class="button button-primary"><?php _e('Download System Report', 'google-calendar-events'); ?></a></p>
58 58
 		</div>
59 59
 		<hr>
60 60
 		<?php
61 61
 
62 62
 		global $wpdb;
63
-		$wp_version = get_bloginfo( 'version' );
63
+		$wp_version = get_bloginfo('version');
64 64
 
65 65
 		$sections = array();
66 66
 		$panels   = array(
67 67
 			'wordpress' => array(
68
-				'label'  => __( 'WordPress Installation', 'google-calendar-events' ),
68
+				'label'  => __('WordPress Installation', 'google-calendar-events'),
69 69
 				'export' => 'WordPress Installation',
70 70
 			),
71 71
 			'theme'     => array(
72
-				'label'  => __( 'Active Theme', 'google-calendar-events' ),
72
+				'label'  => __('Active Theme', 'google-calendar-events'),
73 73
 				'export' => 'Active Theme',
74 74
 			),
75 75
 			'plugins'   => array(
76
-				'label'  => __( 'Active Plugins', 'google-calendar-events' ),
76
+				'label'  => __('Active Plugins', 'google-calendar-events'),
77 77
 				'export' => 'Active Plugins',
78 78
 			),
79 79
 			'server'    => array(
80
-				'label'  => __( 'Server Environment', 'google-calendar-events' ),
80
+				'label'  => __('Server Environment', 'google-calendar-events'),
81 81
 				'export' => 'Server Environment',
82 82
 			),
83 83
 			'client'    => array(
84
-				'label'  => __( 'Client Information', 'google-calendar-events' ),
84
+				'label'  => __('Client Information', 'google-calendar-events'),
85 85
 				'export' => 'Client Information',
86 86
 			)
87 87
 		);
@@ -98,68 +98,68 @@  discard block
 block discarded – undo
98 98
 		 * ======================
99 99
 		 */
100 100
 
101
-		$debug_mode = $script_debug = __( 'No', 'google-calendar-events' );
102
-		if ( defined( 'WP_DEBUG' ) ) {
103
-			$debug_mode = true === WP_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $debug_mode;
101
+		$debug_mode = $script_debug = __('No', 'google-calendar-events');
102
+		if (defined('WP_DEBUG')) {
103
+			$debug_mode = true === WP_DEBUG ? __('Yes', 'google-calendar-events') : $debug_mode;
104 104
 		}
105
-		if ( defined( 'SCRIPT_DEBUG' ) ) {
106
-			$script_debug = true === SCRIPT_DEBUG ? __( 'Yes', 'google-calendar-events' ) : $script_debug;
105
+		if (defined('SCRIPT_DEBUG')) {
106
+			$script_debug = true === SCRIPT_DEBUG ? __('Yes', 'google-calendar-events') : $script_debug;
107 107
 		}
108 108
 
109
-		$memory = $this->let_to_num( WP_MEMORY_LIMIT );
110
-		$memory_export = size_format( $memory );
111
-		if ( $memory < 67108864 ) {
112
-			$memory = '<mark class="error">' . sprintf( __( '%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events' ), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP' ) . '</mark>';
109
+		$memory = $this->let_to_num(WP_MEMORY_LIMIT);
110
+		$memory_export = size_format($memory);
111
+		if ($memory < 67108864) {
112
+			$memory = '<mark class="error">'.sprintf(__('%1$s - It is recomendend to set memory to at least 64MB. See: <a href="%2$s" target="_blank">Increasing memory allocated to PHP</a>', 'google-calendar-events'), $memory_export, 'http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP').'</mark>';
113 113
 		} else {
114
-			$memory = '<mark class="ok">' . $memory_export . '</mark>';
114
+			$memory = '<mark class="ok">'.$memory_export.'</mark>';
115 115
 		}
116 116
 
117
-		$permalinks = get_option( 'permalink_structure' );
118
-		$permalinks = empty( $permalinks ) ? '/?' : $permalinks;
117
+		$permalinks = get_option('permalink_structure');
118
+		$permalinks = empty($permalinks) ? '/?' : $permalinks;
119 119
 
120 120
 		$is_multisite = is_multisite();
121 121
 
122 122
 		$sections['wordpress'] = array(
123 123
 			'name'          => array(
124
-				'label'  => __( 'Site Name', 'google-calendar-events' ),
124
+				'label'  => __('Site Name', 'google-calendar-events'),
125 125
 				'label_export' => 'Site Name',
126
-				'result' => get_bloginfo( 'name' ),
126
+				'result' => get_bloginfo('name'),
127 127
 			),
128 128
 			'home_url'      => array(
129
-				'label'  => __( 'Home URL', 'google-calendar-events' ),
129
+				'label'  => __('Home URL', 'google-calendar-events'),
130 130
 				'label_export' => 'Home URL',
131 131
 				'result' => home_url(),
132 132
 			),
133 133
 			'site_url'      => array(
134
-				'label'  => __( 'Site URL', 'google-calendar-events' ),
134
+				'label'  => __('Site URL', 'google-calendar-events'),
135 135
 				'label_export' => 'Site URL',
136 136
 				'result' => site_url(),
137 137
 			),
138 138
 			'version'       => array(
139
-				'label'  => __( 'Version', 'google-calendar-events' ),
139
+				'label'  => __('Version', 'google-calendar-events'),
140 140
 				'label_export' => 'Version',
141 141
 				'result' => $wp_version,
142 142
 			),
143 143
 			'locale'        => array(
144
-				'label'  => __( 'Locale', 'google-calendar-events' ),
144
+				'label'  => __('Locale', 'google-calendar-events'),
145 145
 				'label_export' => 'Locale',
146 146
 				'result' => get_locale(),
147 147
 			),
148 148
 			'wp_timezone'   => array(
149
-				'label'  => __( 'Timezone', 'google-calendar-events' ),
149
+				'label'  => __('Timezone', 'google-calendar-events'),
150 150
 				'label_export' => 'Timezone',
151 151
 				'result' => simcal_get_wp_timezone(),
152 152
 			),
153 153
 			'multisite'     => array(
154
-				'label'  => __( 'Multisite', 'google-calendar-events' ),
154
+				'label'  => __('Multisite', 'google-calendar-events'),
155 155
 				'label_export' => 'Multisite',
156
-				'result' => $is_multisite ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
156
+				'result' => $is_multisite ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
157 157
 				'result_export' => $is_multisite ? 'Yes' : 'No'
158 158
 			),
159 159
 			'permalink'     => array(
160
-				'label'  => __( 'Permalinks', 'google-calendar-events' ),
160
+				'label'  => __('Permalinks', 'google-calendar-events'),
161 161
 				'label_export' => 'Permalinks',
162
-				'result' => '<code>' . $permalinks . '</code>',
162
+				'result' => '<code>'.$permalinks.'</code>',
163 163
 				'result_export' => $permalinks,
164 164
 			),
165 165
 			'memory_limit'  => array(
@@ -182,86 +182,86 @@  discard block
 block discarded – undo
182 182
 		 * ============
183 183
 		 */
184 184
 
185
-		include_once ABSPATH . 'wp-admin/includes/theme-install.php';
185
+		include_once ABSPATH.'wp-admin/includes/theme-install.php';
186 186
 
187
-		if ( version_compare( $wp_version, '3.4', '<' ) ) {
188
-			$active_theme  = get_theme_data( get_stylesheet_directory() . '/style.css' );
189
-			$theme_name    = '<a href="' . $active_theme['URI'] . '" target="_blank">' . $active_theme['Name'] . '</a>';
187
+		if (version_compare($wp_version, '3.4', '<')) {
188
+			$active_theme  = get_theme_data(get_stylesheet_directory().'/style.css');
189
+			$theme_name    = '<a href="'.$active_theme['URI'].'" target="_blank">'.$active_theme['Name'].'</a>';
190 190
 			$theme_version = $active_theme['Version'];
191
-			$theme_author  = '<a href="' . $active_theme['AuthorURI'] . '" target="_blank">' . $active_theme['Author'] . '</a>';
192
-			$theme_export  = $active_theme['Name'] . ' - ' . $theme_version;
191
+			$theme_author  = '<a href="'.$active_theme['AuthorURI'].'" target="_blank">'.$active_theme['Author'].'</a>';
192
+			$theme_export  = $active_theme['Name'].' - '.$theme_version;
193 193
 		} else {
194 194
 			$active_theme  = wp_get_theme();
195
-			$theme_name    = '<a href="' . $active_theme->ThemeURI . '" target="_blank">' . $active_theme->Name . '</a>';
195
+			$theme_name    = '<a href="'.$active_theme->ThemeURI.'" target="_blank">'.$active_theme->Name.'</a>';
196 196
 			$theme_version = $active_theme->Version;
197 197
 			$theme_author  = $active_theme->Author;
198
-			$theme_export  = $active_theme->Name . ' - ' . $theme_version;
198
+			$theme_export  = $active_theme->Name.' - '.$theme_version;
199 199
 		}
200 200
 
201 201
 		$theme_update_version = $theme_version;
202 202
 
203
-		$api = themes_api( 'theme_information', array(
203
+		$api = themes_api('theme_information', array(
204 204
 			'slug'   => get_template(),
205
-			'fields' => array( 'sections' => false, 'tags' => false ),
206
-		) );
207
-		if ( $api && ! is_wp_error( $api ) ) {
205
+			'fields' => array('sections' => false, 'tags' => false),
206
+		));
207
+		if ($api && ! is_wp_error($api)) {
208 208
 			$theme_update_version = $api->version;
209 209
 		}
210 210
 
211
-		if ( version_compare( $theme_version, $theme_update_version, '<' ) ) {
212
-			$theme_version = '<mark class="error">' . $theme_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $theme_update_version ) ) . ')</mark>';
211
+		if (version_compare($theme_version, $theme_update_version, '<')) {
212
+			$theme_version = '<mark class="error">'.$theme_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($theme_update_version)).')</mark>';
213 213
 		} else {
214
-			$theme_version = '<mark class="ok">' . $theme_version . '</mark>';
214
+			$theme_version = '<mark class="ok">'.$theme_version.'</mark>';
215 215
 		}
216 216
 
217 217
 		$theme  = '<dl>';
218
-		$theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) . '</dt>';
219
-		$theme .= '<dd>' . $theme_name . '</dd>';
220
-		$theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) . '</dt>';
221
-		$theme .= '<dd>' . $theme_author . '</dd>';
222
-		$theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
223
-		$theme .= '<dd>' . $theme_version . '</dd>';
218
+		$theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
219
+		$theme .= '<dd>'.$theme_name.'</dd>';
220
+		$theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
221
+		$theme .= '<dd>'.$theme_author.'</dd>';
222
+		$theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
223
+		$theme .= '<dd>'.$theme_version.'</dd>';
224 224
 		$theme .= '</dl>';
225 225
 
226 226
 		$is_child_theme = is_child_theme();
227 227
 		$parent_theme = $parent_theme_export = '-';
228 228
 
229
-		if ( $is_child_theme ) {
230
-			if ( version_compare( $wp_version, '3.4', '<' ) ) {
229
+		if ($is_child_theme) {
230
+			if (version_compare($wp_version, '3.4', '<')) {
231 231
 
232 232
 				$parent_theme = $parent_theme_export = $active_theme['Template'];
233 233
 
234 234
 			} else {
235 235
 
236
-				$parent = wp_get_theme( $active_theme->Template );
236
+				$parent = wp_get_theme($active_theme->Template);
237 237
 				$parent_theme  = '<dl>';
238
-				$parent_theme .= '<dt>' . __( 'Name', 'google-calendar-events' ) .    '</dt>';
239
-				$parent_theme .= '<dd>' . $parent->Name .          '</dd>';
240
-				$parent_theme .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
241
-				$parent_theme .= '<dd>' . $parent->Author .        '</dd>';
242
-				$parent_theme .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
243
-				$parent_theme .= '<dd>' . $parent->Version .       '</dd>';
238
+				$parent_theme .= '<dt>'.__('Name', 'google-calendar-events').'</dt>';
239
+				$parent_theme .= '<dd>'.$parent->Name.'</dd>';
240
+				$parent_theme .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
241
+				$parent_theme .= '<dd>'.$parent->Author.'</dd>';
242
+				$parent_theme .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
243
+				$parent_theme .= '<dd>'.$parent->Version.'</dd>';
244 244
 				$parent_theme .= '</dl>';
245 245
 
246
-				$parent_theme_export = strip_tags( $parent->Name ) . ' - ' .  $parent->Version;
246
+				$parent_theme_export = strip_tags($parent->Name).' - '.$parent->Version;
247 247
 			}
248 248
 		}
249 249
 
250 250
 		$sections['theme'] = array(
251 251
 			'theme'    => array(
252
-				'label'  => __( 'Theme Information', 'google-calendar-events' ),
252
+				'label'  => __('Theme Information', 'google-calendar-events'),
253 253
 				'label_export' => 'Theme',
254 254
 				'result' => $theme,
255 255
 				'result_export' => $theme_export,
256 256
 			),
257 257
 			'theme_child'   => array(
258
-				'label'  => __( 'Child Theme', 'google-calendar-events' ),
258
+				'label'  => __('Child Theme', 'google-calendar-events'),
259 259
 				'label_export' => 'Child Theme',
260
-				'result' => $is_child_theme ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
260
+				'result' => $is_child_theme ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
261 261
 				'result_export' => $is_child_theme ? 'Yes' : 'No',
262 262
 			),
263 263
 			'theme_parent'   => array(
264
-				'label'  => __( 'Parent Theme', 'google-calendar-events' ),
264
+				'label'  => __('Parent Theme', 'google-calendar-events'),
265 265
 				'label_export' => 'Parent Theme',
266 266
 				'result' => $parent_theme,
267 267
 				'result_export' => $parent_theme_export,
@@ -273,61 +273,61 @@  discard block
 block discarded – undo
273 273
 		 * ==============
274 274
 		 */
275 275
 
276
-		include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
276
+		include_once ABSPATH.'wp-admin/includes/plugin-install.php';
277 277
 
278
-		$active_plugins = (array) get_option( 'active_plugins', array() );
279
-		if ( is_multisite() ) {
280
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
278
+		$active_plugins = (array) get_option('active_plugins', array());
279
+		if (is_multisite()) {
280
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
281 281
 		}
282 282
 
283
-		foreach ( $active_plugins as $plugin ) {
283
+		foreach ($active_plugins as $plugin) {
284 284
 
285
-			$plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
285
+			$plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
286 286
 
287
-			if ( ! empty( $plugin_data['Name'] ) ) {
287
+			if ( ! empty($plugin_data['Name'])) {
288 288
 
289 289
 				$plugin_name    = $plugin_data['Title'];
290 290
 				$plugin_author  = $plugin_data['Author'];
291 291
 				$plugin_version = $plugin_update_version = $plugin_data['Version'];
292 292
 
293 293
 				// Afraid that querying many plugins may risk a timeout.
294
-				if ( count( $active_plugins ) <= 10 ) {
295
-					$api = plugins_api( 'plugin_information', array(
294
+				if (count($active_plugins) <= 10) {
295
+					$api = plugins_api('plugin_information', array(
296 296
 						'slug'   => $plugin_data['Name'],
297 297
 						'fields' => array(
298 298
 							'version' => true,
299 299
 						),
300
-					) );
301
-					if ( $api && ! is_wp_error( $api ) ) {
302
-						if ( ! empty( $api->version ) ) {
300
+					));
301
+					if ($api && ! is_wp_error($api)) {
302
+						if ( ! empty($api->version)) {
303 303
 							$plugin_update_version = $api->version;
304
-							if ( version_compare( $plugin_version, $plugin_update_version, '<' ) ) {
305
-								$plugin_version = '<mark class="error">' . $plugin_version . ' (' . sprintf( __( '%s is available', 'google-calendar-events' ), esc_html( $plugin_update_version ) ) . ')</mark>';
304
+							if (version_compare($plugin_version, $plugin_update_version, '<')) {
305
+								$plugin_version = '<mark class="error">'.$plugin_version.' ('.sprintf(__('%s is available', 'google-calendar-events'), esc_html($plugin_update_version)).')</mark>';
306 306
 							} else {
307
-								$plugin_version = '<mark class="ok">' . $plugin_version . '</mark>';
307
+								$plugin_version = '<mark class="ok">'.$plugin_version.'</mark>';
308 308
 							}
309 309
 						}
310 310
 					}
311 311
 				}
312 312
 
313 313
 				$plugin  = '<dl>';
314
-				$plugin .= '<dt>' . __( 'Author', 'google-calendar-events' ) .  '</dt>';
315
-				$plugin .= '<dd>' . $plugin_author .         '</dd>';
316
-				$plugin .= '<dt>' . __( 'Version', 'google-calendar-events' ) . '</dt>';
317
-				$plugin .= '<dd>' . $plugin_version .        '</dd>';
314
+				$plugin .= '<dt>'.__('Author', 'google-calendar-events').'</dt>';
315
+				$plugin .= '<dd>'.$plugin_author.'</dd>';
316
+				$plugin .= '<dt>'.__('Version', 'google-calendar-events').'</dt>';
317
+				$plugin .= '<dd>'.$plugin_version.'</dd>';
318 318
 				$plugin .= '</dl>';
319 319
 
320
-				$sections['plugins'][ sanitize_key( strip_tags( $plugin_name ) ) ] = array(
320
+				$sections['plugins'][sanitize_key(strip_tags($plugin_name))] = array(
321 321
 					'label'  => $plugin_name,
322
-					'label_export' => strip_tags( $plugin_data['Title'] ),
322
+					'label_export' => strip_tags($plugin_data['Title']),
323 323
 					'result' => $plugin,
324 324
 					'result_export' => $plugin_data['Version'],
325 325
 				);
326 326
 			}
327 327
 		}
328 328
 
329
-		if ( isset( $sections['plugins'] ) ) {
330
-			rsort( $sections['plugins'] );
329
+		if (isset($sections['plugins'])) {
330
+			rsort($sections['plugins']);
331 331
 		}
332 332
 
333 333
 		/**
@@ -335,51 +335,51 @@  discard block
 block discarded – undo
335 335
 		 * ==================
336 336
 		 */
337 337
 
338
-		if ( version_compare( PHP_VERSION, '5.5.19', '<' ) ) {
339
-			$php = '<mark class="error">' . sprintf( __( '%1$s - It is recomendend to upgrade at least to PHP version 5.5.19 for security reasons. <a href="%2$s" target="_blank">Read more.</a>', 'google-calendar-events' ), PHP_VERSION, 'http://www.wpupdatephp.com/update/' ) . '</mark>';
338
+		if (version_compare(PHP_VERSION, '5.5.19', '<')) {
339
+			$php = '<mark class="error">'.sprintf(__('%1$s - It is recomendend to upgrade at least to PHP version 5.5.19 for security reasons. <a href="%2$s" target="_blank">Read more.</a>', 'google-calendar-events'), PHP_VERSION, 'http://www.wpupdatephp.com/update/').'</mark>';
340 340
 		} else {
341
-			$php = '<mark class="ok">' . PHP_VERSION . '</mark>';
341
+			$php = '<mark class="ok">'.PHP_VERSION.'</mark>';
342 342
 		}
343 343
 
344
-		if ( $wpdb->use_mysqli ) {
345
-			$mysql = @mysqli_get_server_info( $wpdb->dbh );
344
+		if ($wpdb->use_mysqli) {
345
+			$mysql = @mysqli_get_server_info($wpdb->dbh);
346 346
 		} else {
347 347
 			$mysql = @mysql_get_server_info();
348 348
 		}
349 349
 
350 350
 		$host = $_SERVER['SERVER_SOFTWARE'];
351
-		if ( defined( 'WPE_APIKEY' ) ) {
351
+		if (defined('WPE_APIKEY')) {
352 352
 			$host .= ' (WP Engine)';
353
-		} elseif ( defined( 'PAGELYBIN' ) ) {
353
+		} elseif (defined('PAGELYBIN')) {
354 354
 			$host .= ' (Pagely)';
355 355
 		}
356 356
 
357 357
 		$default_timezone = $server_timezone_export = date_default_timezone_get();
358
-		if ( 'UTC' !== $default_timezone ) {
359
-			$server_timezone = '<mark class="error">' . sprintf( __( 'Server default timezone is %s - it should be UTC', 'google-calendar-events' ), $default_timezone ) . '</mark>';
358
+		if ('UTC' !== $default_timezone) {
359
+			$server_timezone = '<mark class="error">'.sprintf(__('Server default timezone is %s - it should be UTC', 'google-calendar-events'), $default_timezone).'</mark>';
360 360
 		} else {
361 361
 			$server_timezone = '<mark class="ok">UTC</mark>';
362 362
 		}
363 363
 
364 364
 		// WP Remote POST test.
365
-		$response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
365
+		$response = wp_safe_remote_post('https://www.paypal.com/cgi-bin/webscr', array(
366 366
 			'timeout'    => 60,
367 367
 			'body'       => array(
368 368
 				'cmd'    => '_notify-validate',
369 369
 			),
370
-		) );
371
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
370
+		));
371
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
372 372
 			$wp_post_export = 'Yes';
373
-			$wp_post = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
373
+			$wp_post = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
374 374
 		} else {
375 375
 			$wp_post_export = 'No';
376
-			$wp_post = '<mark class="error">' . __( 'No', 'google-calendar-events' );
377
-			if ( is_wp_error( $response ) ) {
378
-				$error = ' (' . $response->get_error_message() . ')';
376
+			$wp_post = '<mark class="error">'.__('No', 'google-calendar-events');
377
+			if (is_wp_error($response)) {
378
+				$error = ' ('.$response->get_error_message().')';
379 379
 				$wp_post .= $error;
380 380
 				$wp_post_export .= $error;
381 381
 			} else {
382
-				$error = ' (' . $response['response']['code'] . ')';
382
+				$error = ' ('.$response['response']['code'].')';
383 383
 				$wp_post .= $error;
384 384
 				$wp_post_export .= $error;
385 385
 			}
@@ -387,70 +387,70 @@  discard block
 block discarded – undo
387 387
 		}
388 388
 
389 389
 		// WP Remote GET test.
390
-		$response = wp_safe_remote_get( get_home_url( '/?p=1' ) );
391
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
390
+		$response = wp_safe_remote_get(get_home_url('/?p=1'));
391
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
392 392
 			$wp_get_export = 'Yes';
393
-			$wp_get = '<mark class="ok">' . __( 'Yes', 'google-calendar-events' ) . '</mark>';
393
+			$wp_get = '<mark class="ok">'.__('Yes', 'google-calendar-events').'</mark>';
394 394
 		} else {
395 395
 			$wp_get_export = 'No';
396
-			$wp_get = '<mark class="error">' . __( 'No', 'google-calendar-events' );
397
-			if ( is_wp_error( $response ) ) {
398
-				$error = ' (' . $response->get_error_message() . ')';
396
+			$wp_get = '<mark class="error">'.__('No', 'google-calendar-events');
397
+			if (is_wp_error($response)) {
398
+				$error = ' ('.$response->get_error_message().')';
399 399
 				$wp_get .= $error;
400 400
 				$wp_get_export .= $error;
401 401
 			} else {
402
-				$error = ' (' . $response['response']['code'] . ')';
402
+				$error = ' ('.$response['response']['code'].')';
403 403
 				$wp_get .= $error;
404 404
 				$wp_get_export .= $error;
405 405
 			}
406 406
 			$wp_get .= '</mark>';
407 407
 		}
408 408
 
409
-		$php_memory_limit        = ini_get( 'memory_limit' );
410
-		$php_max_upload_filesize = ini_get( 'upload_max_filesize' );
411
-		$php_post_max_size       = ini_get( 'post_max_size' );
412
-		$php_max_execution_time  = ini_get( 'max_execution_time' );
413
-		$php_max_input_vars      = ini_get( 'max_input_vars' );
409
+		$php_memory_limit        = ini_get('memory_limit');
410
+		$php_max_upload_filesize = ini_get('upload_max_filesize');
411
+		$php_post_max_size       = ini_get('post_max_size');
412
+		$php_max_execution_time  = ini_get('max_execution_time');
413
+		$php_max_input_vars      = ini_get('max_input_vars');
414 414
 
415 415
 		$curl_info = '';
416 416
 
417
-		if ( function_exists( 'curl_version' ) ) {
417
+		if (function_exists('curl_version')) {
418 418
 			$curl_info = curl_version();
419 419
 		}
420 420
 
421 421
 		$sections['server'] = array(
422 422
 			'host'                => array(
423
-				'label'  => __( 'Web Server', 'google-calendar-events' ),
423
+				'label'  => __('Web Server', 'google-calendar-events'),
424 424
 				'label_export' => 'Web Server',
425 425
 				'result' => $host,
426 426
 			),
427 427
 			'php_version'         => array(
428
-				'label'  => __( 'PHP Version', 'google-calendar-events' ),
428
+				'label'  => __('PHP Version', 'google-calendar-events'),
429 429
 				'label_export' => 'PHP Version',
430 430
 				'result' => $php,
431 431
 				'result_export' => PHP_VERSION,
432 432
 			),
433 433
 			'mysql_version'       => array(
434
-				'label'  => __( 'MySQL Version', 'google-calendar-events' ),
434
+				'label'  => __('MySQL Version', 'google-calendar-events'),
435 435
 				'label_export' => 'MySQL Version',
436
-				'result' => version_compare( $mysql, '5.5', '>' ) ? '<mark class="ok">' . $mysql . '</mark>' : $mysql,
436
+				'result' => version_compare($mysql, '5.5', '>') ? '<mark class="ok">'.$mysql.'</mark>' : $mysql,
437 437
 				'result_export' => $mysql,
438 438
 			),
439 439
 			'server_timezone'     => array(
440
-				'label'  => __( 'Server Timezone', 'google-calendar-events' ),
440
+				'label'  => __('Server Timezone', 'google-calendar-events'),
441 441
 				'label_export' => 'Server Timezone',
442 442
 				'result' => $server_timezone,
443 443
 				'result_export' => $server_timezone_export,
444 444
 			),
445 445
 			'display_errors'      => array(
446 446
 				'label'  => 'Display Errors',
447
-				'result' => ( ini_get( 'display_errors' ) ) ? __( 'Yes', 'google-calendar-events' ) . ' (' . ini_get( 'display_errors' ) . ')' : '-',
448
-				'result_export' => ( ini_get( 'display_errors' ) ) ? 'Yes' : 'No',
447
+				'result' => (ini_get('display_errors')) ? __('Yes', 'google-calendar-events').' ('.ini_get('display_errors').')' : '-',
448
+				'result_export' => (ini_get('display_errors')) ? 'Yes' : 'No',
449 449
 			),
450 450
 			'php_safe_mode'       => array(
451 451
 				'label'  => 'Safe Mode',
452
-				'result' => ( ini_get( 'safe_mode' ) ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
453
-				'result_export' => ( ini_get( 'safe_mode' ) ) ? 'Yes' : 'No',
452
+				'result' => (ini_get('safe_mode')) ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
453
+				'result_export' => (ini_get('safe_mode')) ? 'Yes' : 'No',
454 454
 			),
455 455
 			'php_memory_limit'    => array(
456 456
 				'label'  => 'Memory Limit',
@@ -474,23 +474,23 @@  discard block
 block discarded – undo
474 474
 			),
475 475
 			'fsockopen'           => array(
476 476
 				'label'  => 'fsockopen',
477
-				'result' => function_exists( 'fsockopen' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
478
-				'result_export' => function_exists( 'fsockopen' ) ? 'Yes' : 'No',
477
+				'result' => function_exists('fsockopen') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
478
+				'result_export' => function_exists('fsockopen') ? 'Yes' : 'No',
479 479
 			),
480 480
 			'curl_init'           => array(
481 481
 				'label'         => 'cURL',
482
-				'result'        => ! empty( $curl_info ) ? $curl_info['version'] . ', ' . $curl_info['ssl_version'] : __( 'No version found.', 'google-calendar-events' ),
483
-				'result_export' => ! empty( $curl_info ) ? $curl_info['version'] . ', ' . $curl_info['ssl_version'] : 'No version found.',
482
+				'result'        => ! empty($curl_info) ? $curl_info['version'].', '.$curl_info['ssl_version'] : __('No version found.', 'google-calendar-events'),
483
+				'result_export' => ! empty($curl_info) ? $curl_info['version'].', '.$curl_info['ssl_version'] : 'No version found.',
484 484
 			),
485 485
 			'soap'                => array(
486 486
 				'label'  => 'SOAP',
487
-				'result' => class_exists( 'SoapClient' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
488
-				'result_export' => class_exists( 'SoapClient' ) ? 'Yes' : 'No',
487
+				'result' => class_exists('SoapClient') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
488
+				'result_export' => class_exists('SoapClient') ? 'Yes' : 'No',
489 489
 			),
490 490
 			'suhosin'             => array(
491 491
 				'label'  => 'SUHOSIN',
492
-				'result' => extension_loaded( 'suhosin' ) ? __( 'Yes', 'google-calendar-events' ) : __( 'No', 'google-calendar-events' ),
493
-				'result_export' => extension_loaded( 'suhosin' ) ? 'Yes' : 'No',
492
+				'result' => extension_loaded('suhosin') ? __('Yes', 'google-calendar-events') : __('No', 'google-calendar-events'),
493
+				'result_export' => extension_loaded('suhosin') ? 'Yes' : 'No',
494 494
 			),
495 495
 			'wp_remote_post'      => array(
496 496
 				'label'  => 'WP Remote POST',
@@ -512,26 +512,26 @@  discard block
 block discarded – undo
512 512
 		$user_client = new \SimpleCalendar\Browser();
513 513
 
514 514
 		$browser  = '<dl>';
515
-		$browser .= '<dt>' . __( 'Name:', 'google-calendar-events' ) .         '</dt>';
516
-		$browser .= '<dd>' . $user_client->getBrowser() .   '</dd>';
517
-		$browser .= '<dt>' . __( 'Version:', 'google-calendar-events' ) .      '</dt>';
518
-		$browser .= '<dd>' . $user_client->getVersion() .   '</dd>';
519
-		$browser .= '<dt>' . __( 'User Agent:', 'google-calendar-events' ) .   '</dt>';
520
-		$browser .= '<dd>' . $user_client->getUserAgent() . '</dd>';
521
-		$browser .= '<dt>' . __( 'Platform:', 'google-calendar-events' ) .     '</dt>';
522
-		$browser .= '<dd>' . $user_client->getPlatform() .  '</dd>';
515
+		$browser .= '<dt>'.__('Name:', 'google-calendar-events').'</dt>';
516
+		$browser .= '<dd>'.$user_client->getBrowser().'</dd>';
517
+		$browser .= '<dt>'.__('Version:', 'google-calendar-events').'</dt>';
518
+		$browser .= '<dd>'.$user_client->getVersion().'</dd>';
519
+		$browser .= '<dt>'.__('User Agent:', 'google-calendar-events').'</dt>';
520
+		$browser .= '<dd>'.$user_client->getUserAgent().'</dd>';
521
+		$browser .= '<dt>'.__('Platform:', 'google-calendar-events').'</dt>';
522
+		$browser .= '<dd>'.$user_client->getPlatform().'</dd>';
523 523
 		$browser .= '</dl>';
524 524
 
525
-		$browser_export = $user_client->getBrowser() . ' ' . $user_client->getVersion() . ' (' . $user_client->getPlatform() . ')';
525
+		$browser_export = $user_client->getBrowser().' '.$user_client->getVersion().' ('.$user_client->getPlatform().')';
526 526
 
527 527
 		$sections['client'] = array(
528 528
 			'user_ip' => array(
529
-				'label'  => __( 'IP Address', 'google-calendar-events' ),
529
+				'label'  => __('IP Address', 'google-calendar-events'),
530 530
 				'label_export' => 'IP Address',
531 531
 				'result' => $_SERVER['SERVER_ADDR'],
532 532
 			),
533 533
 			'browser' => array(
534
-				'label'  => __( 'Browser', 'google-calendar-events' ),
534
+				'label'  => __('Browser', 'google-calendar-events'),
535 535
 				'result' => $browser,
536 536
 				'result_export' => $browser_export,
537 537
 			)
@@ -542,12 +542,12 @@  discard block
 block discarded – undo
542 542
 		 * ============
543 543
 		 */
544 544
 
545
-		$panels   = apply_filters( 'simcal_system_status_report_panels', $panels );
546
-		$sections = apply_filters( 'simcal_system_status_report_sections', $sections );
545
+		$panels   = apply_filters('simcal_system_status_report_panels', $panels);
546
+		$sections = apply_filters('simcal_system_status_report_sections', $sections);
547 547
 
548
-		foreach ( $panels as $panel => $v ) :
548
+		foreach ($panels as $panel => $v) :
549 549
 
550
-			if ( isset( $sections[ $panel ] ) ) :
550
+			if (isset($sections[$panel])) :
551 551
 
552 552
 				?>
553 553
 				<table class="widefat simcal-system-status-report-panel">
@@ -557,15 +557,15 @@  discard block
 block discarded – undo
557 557
 						</tr>
558 558
 					</thead>
559 559
 					<tbody>
560
-						<?php foreach ( $sections[ $panel ] as $row => $cell ) : ?>
560
+						<?php foreach ($sections[$panel] as $row => $cell) : ?>
561 561
 							<tr>
562 562
 								<?php
563
-								$label_export  = isset( $cell['label_export']  ) ? $cell['label_export']  : $cell['label'];
564
-								$result_export = isset( $cell['result_export'] ) ? $cell['result_export'] : $cell['result'];
563
+								$label_export  = isset($cell['label_export']) ? $cell['label_export'] : $cell['label'];
564
+								$result_export = isset($cell['result_export']) ? $cell['result_export'] : $cell['result'];
565 565
 								?>
566
-								<td class="tooltip"><?php echo isset( $cell['tooltip'] ) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="' . $cell['tooltip'] . '"></i> ' : ''; ?></td>
567
-								<td class="label" data-export="<?php echo trim( $label_export ); ?>"><?php echo $cell['label']; ?></td>
568
-								<td class="result" data-export="<?php echo trim( $result_export ); ?>"><?php echo $cell['result']; ?></td>
566
+								<td class="tooltip"><?php echo isset($cell['tooltip']) ? ' <i class="simcal-icon-help simcal-help-tip" data-tip="'.$cell['tooltip'].'"></i> ' : ''; ?></td>
567
+								<td class="label" data-export="<?php echo trim($label_export); ?>"><?php echo $cell['label']; ?></td>
568
+								<td class="result" data-export="<?php echo trim($result_export); ?>"><?php echo $cell['result']; ?></td>
569 569
 							</tr>
570 570
 						<?php endforeach; ?>
571 571
 					</tbody>
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 			jQuery( '#simcal-system-status-report-download' ).on( 'click', function() {
644 644
 				var file = new Blob( [ report ], { type: 'text/plain' } );
645 645
 				jQuery( this ).attr( 'href', URL.createObjectURL( file ) );
646
-				jQuery( this ).attr( 'download', '<?php echo sanitize_title( str_replace( array( 'http://', 'https://' ), '', get_bloginfo( 'url' ) ) . '-system-report-' . date( 'Y-m-d', time() ) ); ?>' );
646
+				jQuery( this ).attr( 'download', '<?php echo sanitize_title(str_replace(array('http://', 'https://'), '', get_bloginfo('url')).'-system-report-'.date('Y-m-d', time())); ?>' );
647 647
 			} );
648 648
 
649 649
 		</script>
@@ -663,13 +663,13 @@  discard block
 block discarded – undo
663 663
 	 *
664 664
 	 * @return int|double|string
665 665
 	 */
666
-	private function let_to_num( $size ) {
666
+	private function let_to_num($size) {
667 667
 
668
-		$l   = substr( $size, -1 );
669
-		$ret = substr( $size, 0, -1 );
668
+		$l   = substr($size, -1);
669
+		$ret = substr($size, 0, -1);
670 670
 
671 671
 		// Note: do not insert break or default in this switch loop.
672
-		switch ( strtoupper( $l ) ) {
672
+		switch (strtoupper($l)) {
673 673
 			case 'P':
674 674
 				$ret *= 1024;
675 675
 				// no break
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 				$ret *= 1024;
684 684
 				// no break
685 685
 			case 'K':
686
-				$ret *= 1024;;
686
+				$ret *= 1024; ;
687 687
 				// no break
688 688
 		}
689 689
 
Please login to merge, or discard this patch.
includes/feeds/google.php 1 patch
Spacing   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 use SimpleCalendar\Abstracts\Feed;
13 13
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;
14 14
 
15
-if ( ! defined( 'ABSPATH' ) ) {
15
+if ( ! defined('ABSPATH')) {
16 16
 	exit;
17 17
 }
18 18
 
@@ -90,35 +90,35 @@  discard block
 block discarded – undo
90 90
 	 * @param string|Calendar $calendar
91 91
 	 * @param bool $load_admin
92 92
 	 */
93
-	public function __construct( $calendar = '', $load_admin = true ) {
93
+	public function __construct($calendar = '', $load_admin = true) {
94 94
 
95
-		parent::__construct( $calendar );
95
+		parent::__construct($calendar);
96 96
 
97 97
 		$this->type = 'google';
98
-		$this->name = __( 'Google Calendar', 'google-calendar-events' );
98
+		$this->name = __('Google Calendar', 'google-calendar-events');
99 99
 
100 100
 		// Google client config.
101
-		$settings = get_option( 'simple-calendar_settings_feeds' );
102
-		$this->google_api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
103
-		$this->google_client_scopes = array( \Google_Service_Calendar::CALENDAR_READONLY );
101
+		$settings = get_option('simple-calendar_settings_feeds');
102
+		$this->google_api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
103
+		$this->google_client_scopes = array(\Google_Service_Calendar::CALENDAR_READONLY);
104 104
 		$this->google_client = $this->get_client();
105 105
 
106
-		if ( $this->post_id > 0 ) {
106
+		if ($this->post_id > 0) {
107 107
 
108 108
 			// Google query args.
109
-			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
110
-			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
109
+			$this->google_calendar_id       = $this->esc_google_calendar_id(get_post_meta($this->post_id, '_google_calendar_id', true));
110
+			$this->google_events_recurring  = esc_attr(get_post_meta($this->post_id, '_google_events_recurring', true));
111 111
             // note that google_search_query is used in a URL param and not as HTML output, so don't use esc_attr() on it
112
-			$this->google_search_query      = get_post_meta( $this->post_id, '_google_events_search_query', true );
113
-			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
112
+			$this->google_search_query      = get_post_meta($this->post_id, '_google_events_search_query', true);
113
+			$this->google_max_results       = max(absint(get_post_meta($this->post_id, '_google_events_max_results', true)), 1);
114 114
 
115
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
116
-				$this->events = ! empty( $this->google_api_key ) ? $this->get_events() : array();
115
+			if ( ! is_admin() || defined('DOING_AJAX')) {
116
+				$this->events = ! empty($this->google_api_key) ? $this->get_events() : array();
117 117
 			}
118 118
 		}
119 119
 
120
-		if ( is_admin() && $load_admin ) {
121
-			$admin = new Admin( $this, $this->google_api_key, $this->google_calendar_id );
120
+		if (is_admin() && $load_admin) {
121
+			$admin = new Admin($this, $this->google_api_key, $this->google_calendar_id);
122 122
 			$this->settings = $admin->settings_fields();
123 123
 		}
124 124
 	}
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
 	 *
133 133
 	 * @return string
134 134
 	 */
135
-	public function esc_google_calendar_id( $id ) {
136
-		return base64_decode( $id );
135
+	public function esc_google_calendar_id($id) {
136
+		return base64_decode($id);
137 137
 	}
138 138
 
139 139
 	/**
@@ -147,85 +147,85 @@  discard block
 block discarded – undo
147 147
 	 */
148 148
 	public function get_events() {
149 149
 
150
-		$calendar = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
150
+		$calendar = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
151 151
 
152
-		if ( empty( $calendar ) && ! empty( $this->google_calendar_id ) ) {
152
+		if (empty($calendar) && ! empty($this->google_calendar_id)) {
153 153
 
154 154
 			$error = '';
155 155
 
156 156
 			try {
157
-				$response = $this->make_request( $this->google_calendar_id );
158
-			} catch ( \Exception $e ) {
157
+				$response = $this->make_request($this->google_calendar_id);
158
+			} catch (\Exception $e) {
159 159
 				$error .= $e->getMessage();
160 160
 			}
161 161
 
162
-			if ( empty( $error ) && isset( $response['events'] ) && isset( $response['timezone'] ) ) {
162
+			if (empty($error) && isset($response['events']) && isset($response['timezone'])) {
163 163
 
164
-				$calendar = array_merge( $response, array( 'events' => array() ) );
164
+				$calendar = array_merge($response, array('events' => array()));
165 165
 
166 166
 				// If no timezone has been set, use calendar feed.
167
-				if ( 'use_calendar' == $this->timezone_setting ) {
167
+				if ('use_calendar' == $this->timezone_setting) {
168 168
 					$this->timezone = $calendar['timezone'];
169 169
 				}
170 170
 
171
-				$source = isset( $response['title'] ) ? sanitize_text_field( $response['title'] ) : '';
171
+				$source = isset($response['title']) ? sanitize_text_field($response['title']) : '';
172 172
 
173
-				if ( ! empty( $response['events'] ) && is_array( $response['events'] ) ) {
174
-					foreach ( $response['events'] as $event ) {
175
-						if ( $event instanceof \Google_Service_Calendar_Event ) {
173
+				if ( ! empty($response['events']) && is_array($response['events'])) {
174
+					foreach ($response['events'] as $event) {
175
+						if ($event instanceof \Google_Service_Calendar_Event) {
176 176
 
177 177
 							// Visibility and status.
178 178
 							// Public calendars may have private events which can't be properly accessed by simple api key method.
179 179
 							// Also want to skip cancelled events (single occurences deleted from repeating events)
180 180
 							$visibility = $event->getVisibility();
181 181
 							$status = $event->getStatus();
182
-							if ( $this->type == 'google' && ( $visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled' ) ) {
182
+							if ($this->type == 'google' && ($visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled')) {
183 183
 								continue;
184 184
 							}
185 185
 
186 186
 							// Event title & description.
187
-							$title = strip_tags( $event->getSummary() );
188
-							$title = sanitize_text_field( iconv( mb_detect_encoding( $title, mb_detect_order(), true ), 'UTF-8', $title ) );
189
-							$description = wp_kses_post( iconv( mb_detect_encoding( $event->getDescription(), mb_detect_order(), true ), 'UTF-8', $event->getDescription() ) );
187
+							$title = strip_tags($event->getSummary());
188
+							$title = sanitize_text_field(iconv(mb_detect_encoding($title, mb_detect_order(), true), 'UTF-8', $title));
189
+							$description = wp_kses_post(iconv(mb_detect_encoding($event->getDescription(), mb_detect_order(), true), 'UTF-8', $event->getDescription()));
190 190
 
191 191
 							$whole_day = false;
192 192
 
193 193
 							// Event start properties.
194
-							if( 'use_calendar' == $this->timezone_setting ) {
194
+							if ('use_calendar' == $this->timezone_setting) {
195 195
 								$start_timezone = ! $event->getStart()->timeZone ? $calendar['timezone'] : $event->getStart()->timeZone;
196 196
 							} else {
197 197
 								$start_timezone = $this->timezone;
198 198
 							}
199 199
 
200
-							if ( is_null( $event->getStart()->dateTime ) ) {
200
+							if (is_null($event->getStart()->dateTime)) {
201 201
 								// Whole day event.
202
-								$date = Carbon::parse( $event->getStart()->date );
203
-								$google_start = Carbon::createFromDate( $date->year, $date->month, $date->day, $start_timezone )->startOfDay()->addSeconds( 59 );
204
-								$google_start_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->addSeconds( 59 );
202
+								$date = Carbon::parse($event->getStart()->date);
203
+								$google_start = Carbon::createFromDate($date->year, $date->month, $date->day, $start_timezone)->startOfDay()->addSeconds(59);
204
+								$google_start_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->addSeconds(59);
205 205
 								$whole_day = true;
206 206
 							} else {
207
-								$date = Carbon::parse( $event->getStart()->dateTime );
207
+								$date = Carbon::parse($event->getStart()->dateTime);
208 208
 
209 209
 								// Check if there is an event level timezone
210
-								if( $event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting ) {
210
+								if ($event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting) {
211 211
 
212 212
 									// Get the two different times with the separate timezones so we can check the offsets next
213
-									$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
214
-									$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone );
213
+									$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
214
+									$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone);
215 215
 
216 216
 									// Get the offset in hours
217 217
 									$offset1 = $google_start1->offsetHours;
218 218
 									$offset2 = $google_start2->offsetHours;
219 219
 
220 220
 									// Get the difference between the two timezones
221
-									$total_offset = ( $offset2 - $offset1 );
221
+									$total_offset = ($offset2 - $offset1);
222 222
 
223 223
 									// Add the hours offset to the date hour
224 224
 									$date->hour += $total_offset;
225 225
 								}
226 226
 
227
-								$google_start = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone );
228
-								$google_start_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
227
+								$google_start = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone);
228
+								$google_start_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
229 229
 
230 230
 								$this->timezone = $start_timezone;
231 231
 							}
@@ -236,43 +236,43 @@  discard block
 block discarded – undo
236 236
 
237 237
 							$end = $end_utc = $end_timezone = '';
238 238
 							$span = 0;
239
-							if ( false == $event->getEndTimeUnspecified() ) {
239
+							if (false == $event->getEndTimeUnspecified()) {
240 240
 
241 241
 								// Event end properties.
242
-								if( 'use_calendar' == $this->timezone_setting ) {
242
+								if ('use_calendar' == $this->timezone_setting) {
243 243
 									$end_timezone = ! $event->getEnd()->timeZone ? $calendar['timezone'] : $event->getEnd()->timeZone;
244 244
 								} else {
245 245
 									$end_timezone = $this->timezone;
246 246
 								}
247 247
 
248
-								if ( is_null( $event->getEnd()->dateTime ) ) {
248
+								if (is_null($event->getEnd()->dateTime)) {
249 249
 									// Whole day event.
250
-									$date           = Carbon::parse( $event->getEnd()->date );
251
-									$google_end     = Carbon::createFromDate( $date->year, $date->month, $date->day, $end_timezone )->startOfDay()->subSeconds( 59 );
252
-									$google_end_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->subSeconds( 59 );
250
+									$date           = Carbon::parse($event->getEnd()->date);
251
+									$google_end     = Carbon::createFromDate($date->year, $date->month, $date->day, $end_timezone)->startOfDay()->subSeconds(59);
252
+									$google_end_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->subSeconds(59);
253 253
 								} else {
254
-									$date = Carbon::parse( $event->getEnd()->dateTime );
254
+									$date = Carbon::parse($event->getEnd()->dateTime);
255 255
 
256 256
 									// Check if there is an event level timezone
257
-									if( $event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting ) {
257
+									if ($event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting) {
258 258
 
259 259
 										// Get the two different times with the separate timezones so we can check the offsets next
260
-										$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
261
-										$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone );
260
+										$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
261
+										$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone);
262 262
 
263 263
 										// Get the offset in hours
264 264
 										$offset1 = $google_start1->offsetHours;
265 265
 										$offset2 = $google_start2->offsetHours;
266 266
 
267 267
 										// Get the difference between the two timezones
268
-										$total_offset = ( $offset2 - $offset1 );
268
+										$total_offset = ($offset2 - $offset1);
269 269
 
270 270
 										// Add the hours offset to the date hour
271 271
 										$date->hour += $total_offset;
272 272
 									}
273 273
 
274
-									$google_end     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone );
275
-									$google_end_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
274
+									$google_end     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone);
275
+									$google_end_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
276 276
 								}
277 277
 								// End.
278 278
 								$end = $google_end->getTimestamp();
@@ -280,10 +280,10 @@  discard block
 block discarded – undo
280 280
 								$end_utc = $google_end_utc->getTimestamp();
281 281
 
282 282
 								// Count multiple days.
283
-								$span = $google_start->diffInDays( $google_end );
283
+								$span = $google_start->diffInDays($google_end);
284 284
 
285
-								if ( $span == 0 ) {
286
-									if ( ( $google_start->toDateString() !== $google_end->toDateString() ) && $google_end->toTimeString() != '00:00:00' ) {
285
+								if ($span == 0) {
286
+									if (($google_start->toDateString() !== $google_end->toDateString()) && $google_end->toTimeString() != '00:00:00') {
287 287
 										$span = 1;
288 288
 									}
289 289
 								}
@@ -298,19 +298,19 @@  discard block
 block discarded – undo
298 298
 							// Recurring event.
299 299
 							$recurrence = $event->getRecurrence();
300 300
 							$recurring_id = $event->getRecurringEventId();
301
-							if ( ! $recurrence && $recurring_id ) {
301
+							if ( ! $recurrence && $recurring_id) {
302 302
 								$recurrence = true;
303 303
 							}
304 304
 
305 305
 							// Event link.
306
-							if ( 'use_calendar' == $this->timezone_setting ) {
307
-								$link = add_query_arg( array( 'ctz' => $this->timezone ), $event->getHtmlLink() );
306
+							if ('use_calendar' == $this->timezone_setting) {
307
+								$link = add_query_arg(array('ctz' => $this->timezone), $event->getHtmlLink());
308 308
 							} else {
309 309
 								$link = $event->getHtmlLink();
310 310
 							}
311 311
 
312 312
 							// Build the event.
313
-							$calendar['events'][ intval( $start ) ][] = array(
313
+							$calendar['events'][intval($start)][] = array(
314 314
 								'type'           => 'google-calendar',
315 315
 								'source'         => $source,
316 316
 								'title'          => $title,
@@ -338,24 +338,24 @@  discard block
 block discarded – undo
338 338
 						}
339 339
 					}
340 340
 
341
-					if ( ! empty( $calendar['events'] ) ) {
341
+					if ( ! empty($calendar['events'])) {
342 342
 
343
-						ksort( $calendar['events'], SORT_NUMERIC );
343
+						ksort($calendar['events'], SORT_NUMERIC);
344 344
 
345 345
 						set_transient(
346
-							'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
346
+							'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
347 347
 							$calendar,
348
-							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
348
+							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
349 349
 						);
350 350
 					}
351 351
 				}
352 352
 
353 353
 			} else {
354 354
 
355
-				$message  = __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' );
356
-				$message .= '<br><br>' . $error . '<br><br>';
357
-				$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>';
358
-				$message .= __( 'Only you can see this notice.', 'google-calendar-events' );
355
+				$message  = __('While trying to retrieve events, Google returned an error:', 'google-calendar-events');
356
+				$message .= '<br><br>'.$error.'<br><br>';
357
+				$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>';
358
+				$message .= __('Only you can see this notice.', 'google-calendar-events');
359 359
 
360 360
 				return $message;
361 361
 			}
@@ -363,11 +363,11 @@  discard block
 block discarded – undo
363 363
 		}
364 364
 
365 365
 		// If no timezone has been set, use calendar feed.
366
-		if ( 'use_calendar' == $this->timezone_setting && isset( $calendar['timezone'] ) ) {
366
+		if ('use_calendar' == $this->timezone_setting && isset($calendar['timezone'])) {
367 367
 			$this->timezone = $calendar['timezone'];
368 368
 		}
369 369
 
370
-		return isset( $calendar['events'] ) ? $calendar['events'] : array();
370
+		return isset($calendar['events']) ? $calendar['events'] : array();
371 371
 	}
372 372
 
373 373
 	/**
@@ -383,67 +383,67 @@  discard block
 block discarded – undo
383 383
 	 *
384 384
 	 * @throws \Exception On request failure will throw an exception from Google.
385 385
 	 */
386
-	public function make_request( $id = '', $time_min = 0, $time_max = 0 ) {
386
+	public function make_request($id = '', $time_min = 0, $time_max = 0) {
387 387
 
388 388
 		$calendar = array();
389 389
 		$google = $this->get_service();
390 390
 
391
-		if ( ! is_null( $google ) && ! empty( $id ) ) {
391
+		if ( ! is_null($google) && ! empty($id)) {
392 392
 
393 393
 			// Build the request args.
394 394
 			$args = array();
395 395
 
396 396
 			// Expand recurring events.
397
-			if ( $this->google_events_recurring == 'show' ) {
397
+			if ($this->google_events_recurring == 'show') {
398 398
 				$args['singleEvents'] = true;
399 399
 			}
400 400
 
401 401
 			// Query events using search terms.
402
-			if ( ! empty( $this->google_search_query ) ) {
403
-				$args['q'] = rawurlencode( $this->google_search_query );
402
+			if ( ! empty($this->google_search_query)) {
403
+				$args['q'] = rawurlencode($this->google_search_query);
404 404
 			}
405 405
 
406 406
 			// Max results to query.
407
-			$args['maxResults'] = strval( min( absint( $this->google_max_results ), 2500 ) );
407
+			$args['maxResults'] = strval(min(absint($this->google_max_results), 2500));
408 408
 
409 409
 			// Specify a timezone.
410 410
 			$timezone = '';
411
-			if ( 'use_calendar' != get_post_meta( $this->post_id, '_feed_timezone_setting', true ) ) {
411
+			if ('use_calendar' != get_post_meta($this->post_id, '_feed_timezone_setting', true)) {
412 412
 				$args['timeZone'] = $timezone = $this->timezone;
413 413
 			}
414 414
 
415 415
 			// Lower bound (inclusive) for an event's end time to filter by.
416
-			$earliest_event = intval( $this->time_min );
417
-			if ( $earliest_event > 0 ) {
416
+			$earliest_event = intval($this->time_min);
417
+			if ($earliest_event > 0) {
418 418
 				$timeMin = Carbon::now();
419
-				if ( ! empty( $timezone ) ) {
420
-					$timeMin->setTimezone( $timezone );
419
+				if ( ! empty($timezone)) {
420
+					$timeMin->setTimezone($timezone);
421 421
 				}
422
-				$timeMin->setTimestamp( $earliest_event );
422
+				$timeMin->setTimestamp($earliest_event);
423 423
 				$args['timeMin'] = $timeMin->toRfc3339String();
424 424
 			}
425 425
 
426 426
 			// Upper bound (exclusive) for an event's start time to filter by.
427
-			$latest_event = intval( $this->time_max );
428
-			if ( $latest_event > 0 ) {
427
+			$latest_event = intval($this->time_max);
428
+			if ($latest_event > 0) {
429 429
 				$timeMax = Carbon::now();
430
-				if ( ! empty( $timezone ) ) {
431
-					$timeMax->setTimezone( $timezone );
430
+				if ( ! empty($timezone)) {
431
+					$timeMax->setTimezone($timezone);
432 432
 				}
433
-				$timeMax->setTimestamp( $latest_event );
433
+				$timeMax->setTimestamp($latest_event);
434 434
 				$args['timeMax'] = $timeMax->toRfc3339String();
435 435
 			}
436 436
 
437 437
 			// Query events in calendar.
438
-			$response = $google->events->listEvents( $id, $args );
438
+			$response = $google->events->listEvents($id, $args);
439 439
 
440
-			if ( $response instanceof \Google_Service_Calendar_Events ) {
440
+			if ($response instanceof \Google_Service_Calendar_Events) {
441 441
 				$calendar = array(
442 442
 					'id'            => $id,
443 443
 					'title'         => $response->getSummary(),
444 444
 					'description'   => $response->getDescription(),
445 445
 					'timezone'      => $response->getTimeZone(),
446
-					'url'           => esc_url( '//www.google.com/calendar/embed?src=' . $id ),
446
+					'url'           => esc_url('//www.google.com/calendar/embed?src='.$id),
447 447
 					'events'        => $response->getItems(),
448 448
 				);
449 449
 			}
@@ -463,10 +463,10 @@  discard block
 block discarded – undo
463 463
 	private function get_client() {
464 464
 
465 465
 		$client = new \Google_Client();
466
-		$client->setApplicationName( 'Simple Calendar' );
467
-		$client->setScopes( $this->google_client_scopes );
468
-		$client->setDeveloperKey( $this->google_api_key );
469
-		$client->setAccessType( 'online' );
466
+		$client->setApplicationName('Simple Calendar');
467
+		$client->setScopes($this->google_client_scopes);
468
+		$client->setDeveloperKey($this->google_api_key);
469
+		$client->setAccessType('online');
470 470
 
471 471
 		return $client;
472 472
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 	 * @return null|\Google_Service_Calendar
481 481
 	 */
482 482
 	protected function get_service() {
483
-		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar( $this->google_client ) : null;
483
+		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar($this->google_client) : null;
484 484
 	}
485 485
 
486 486
 }
Please login to merge, or discard this patch.
includes/calendars/default-calendar.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 use SimpleCalendar\Calendars\Views;
14 14
 use SimpleCalendar\Events\Event;
15 15
 
16
-if ( ! defined( 'ABSPATH' ) ) {
16
+if ( ! defined('ABSPATH')) {
17 17
 	exit;
18 18
 }
19 19
 
@@ -105,36 +105,36 @@  discard block
 block discarded – undo
105 105
 	 *
106 106
 	 * @param int|object|\WP_Post|Calendar $calendar
107 107
 	 */
108
-	public function __construct( $calendar ) {
108
+	public function __construct($calendar) {
109 109
 
110 110
 		$this->type  = 'default-calendar';
111
-		$this->name  = __( 'Default', 'google-calendar-events' );
112
-		$this->views = apply_filters( 'simcal_default_calendar_views', array(
113
-			'grid' => __( 'Grid', 'google-calendar-events' ),
114
-			'list' => __( 'List', 'google-calendar-events' ),
115
-		) );
111
+		$this->name  = __('Default', 'google-calendar-events');
112
+		$this->views = apply_filters('simcal_default_calendar_views', array(
113
+			'grid' => __('Grid', 'google-calendar-events'),
114
+			'list' => __('List', 'google-calendar-events'),
115
+		));
116 116
 
117
-		parent::__construct( $calendar );
117
+		parent::__construct($calendar);
118 118
 
119
-		if ( ! is_null( $this->post ) ) {
119
+		if ( ! is_null($this->post)) {
120 120
 
121
-			$this->set_properties( $this->view->get_type() );
121
+			$this->set_properties($this->view->get_type());
122 122
 
123 123
 			$id    = $this->id;
124 124
 			$theme = $this->theme;
125 125
 
126
-			add_filter( 'simcal_calendar_class', function ( $class, $post_id ) use ( $theme, $id ) {
127
-				if ( in_array( 'default-calendar', $class ) && $post_id === $id ) {
128
-					array_push( $class, 'default-calendar-' . $theme );
126
+			add_filter('simcal_calendar_class', function($class, $post_id) use ($theme, $id) {
127
+				if (in_array('default-calendar', $class) && $post_id === $id) {
128
+					array_push($class, 'default-calendar-'.$theme);
129 129
 				}
130 130
 
131 131
 				return $class;
132
-			}, 10, 2 );
132
+			}, 10, 2);
133 133
 
134 134
 		}
135 135
 
136 136
 		// Calendar settings handling.
137
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
137
+		if (is_admin() && ! defined('DOING_AJAX')) {
138 138
 			$admin          = new Default_Calendar_Admin();
139 139
 			$this->settings = $admin->settings_fields();
140 140
 		}
@@ -148,49 +148,49 @@  discard block
 block discarded – undo
148 148
 	 *
149 149
 	 * @param  $view
150 150
 	 */
151
-	private function set_properties( $view ) {
151
+	private function set_properties($view) {
152 152
 
153 153
 		// Set styles.
154
-		if ( 'dark' == get_post_meta( $this->id, '_default_calendar_style_theme', true ) ) {
154
+		if ('dark' == get_post_meta($this->id, '_default_calendar_style_theme', true)) {
155 155
 			$this->theme = 'dark';
156 156
 		}
157
-		if ( $today_color = get_post_meta( $this->id, '_default_calendar_style_today', true ) ) {
158
-			$this->today_color = esc_attr( $today_color );
157
+		if ($today_color = get_post_meta($this->id, '_default_calendar_style_today', true)) {
158
+			$this->today_color = esc_attr($today_color);
159 159
 		}
160
-		if ( $day_events_color = get_post_meta( $this->id, '_default_calendar_style_days_events', true ) ) {
161
-			$this->days_events_color = esc_attr( $day_events_color );
160
+		if ($day_events_color = get_post_meta($this->id, '_default_calendar_style_days_events', true)) {
161
+			$this->days_events_color = esc_attr($day_events_color);
162 162
 		}
163 163
 
164 164
 		// Hide too many events.
165
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_limit_visible_events', true ) ) {
166
-			$this->events_limit = absint( get_post_meta( $this->id, '_default_calendar_visible_events', true ) );
165
+		if ('yes' == get_post_meta($this->id, '_default_calendar_limit_visible_events', true)) {
166
+			$this->events_limit = absint(get_post_meta($this->id, '_default_calendar_visible_events', true));
167 167
 		}
168 168
 
169 169
 		// Expand multiple day events.
170
-		if ( 'yes' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) || ( 'list' == $view && 'current_day_only' == get_post_meta( $this->id, '_default_calendar_expand_multi_day_events', true ) ) ) {
170
+		if ('yes' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true) || ('list' == $view && 'current_day_only' == get_post_meta($this->id, '_default_calendar_expand_multi_day_events', true))) {
171 171
 			$this->events = $this->expand_multiple_days_events();
172 172
 		}
173 173
 
174
-		if ( 'grid' == $view ) {
174
+		if ('grid' == $view) {
175 175
 
176 176
 			// Use hover to open event bubbles.
177
-			if ( 'hover' == get_post_meta( $this->id, '_default_calendar_event_bubble_trigger', true ) ) {
177
+			if ('hover' == get_post_meta($this->id, '_default_calendar_event_bubble_trigger', true)) {
178 178
 				$this->event_bubble_trigger = 'hover';
179 179
 			}
180 180
 
181 181
 			// Trim long event titles.
182
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_trim_titles', true ) ) {
183
-				$this->trim_titles = max( absint( get_post_meta( $this->id, '_default_calendar_trim_titles_chars', true ) ), 1 );
182
+			if ('yes' == get_post_meta($this->id, '_default_calendar_trim_titles', true)) {
183
+				$this->trim_titles = max(absint(get_post_meta($this->id, '_default_calendar_trim_titles_chars', true)), 1);
184 184
 			}
185 185
 
186 186
 		} else {
187 187
 
188 188
 			// List range.
189
-			$this->group_type = esc_attr( get_post_meta( $this->id, '_default_calendar_list_range_type', true ) );
190
-			$this->group_span = max( absint( get_post_meta( $this->id, '_default_calendar_list_range_span', true ) ), 1 );
189
+			$this->group_type = esc_attr(get_post_meta($this->id, '_default_calendar_list_range_type', true));
190
+			$this->group_span = max(absint(get_post_meta($this->id, '_default_calendar_list_range_span', true)), 1);
191 191
 
192 192
 			// Make the list look more compact.
193
-			if ( 'yes' == get_post_meta( $this->id, '_default_calendar_compact_list', true ) ) {
193
+			if ('yes' == get_post_meta($this->id, '_default_calendar_compact_list', true)) {
194 194
 				$this->compact_list = true;
195 195
 			}
196 196
 
@@ -211,18 +211,18 @@  discard block
 block discarded – undo
211 211
 		$old_events = $this->events;
212 212
 		$new_events = array();
213 213
 
214
-		if ( ! empty( $old_events ) ) {
214
+		if ( ! empty($old_events)) {
215 215
 
216
-			foreach ( $old_events as $events ) {
217
-				foreach ( $events as $event ) {
218
-					if ( $event instanceof Event ) {
219
-						if ( false !== $event->multiple_days ) {
216
+			foreach ($old_events as $events) {
217
+				foreach ($events as $event) {
218
+					if ($event instanceof Event) {
219
+						if (false !== $event->multiple_days) {
220 220
 							$days = $event->multiple_days;
221 221
 
222
-							if ( $days > 0 ) {
222
+							if ($days > 0) {
223 223
 
224
-								for ( $d = 1; $d <= $days; $d++ ) {
225
-									$new_events[ intval( $event->start + ( $d * DAY_IN_SECONDS ) - 1 ) ][] = $event;
224
+								for ($d = 1; $d <= $days; $d++) {
225
+									$new_events[intval($event->start + ($d * DAY_IN_SECONDS) - 1)][] = $event;
226 226
 								}
227 227
 							}
228 228
 						}
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		}
235 235
 
236 236
 		$events = $old_events + $new_events;
237
-		ksort( $events, SORT_NUMERIC );
237
+		ksort($events, SORT_NUMERIC);
238 238
 
239 239
 		return $events;
240 240
 	}
@@ -250,16 +250,16 @@  discard block
 block discarded – undo
250 250
 	 *
251 251
 	 * @return null|Calendar_View
252 252
 	 */
253
-	public function get_view( $view = '' ) {
253
+	public function get_view($view = '') {
254 254
 
255
-		$view = ! empty( $view ) ? $view : 'grid';
255
+		$view = ! empty($view) ? $view : 'grid';
256 256
 
257
-		do_action( 'simcal_calendar_get_view', $this->type, $view );
257
+		do_action('simcal_calendar_get_view', $this->type, $view);
258 258
 
259
-		if ( 'grid' == $view ) {
260
-			return new Views\Default_Calendar_Grid( $this );
261
-		} elseif ( 'list' == $view ) {
262
-			return new Views\Default_Calendar_List( $this );
259
+		if ('grid' == $view) {
260
+			return new Views\Default_Calendar_Grid($this);
261
+		} elseif ('list' == $view) {
262
+			return new Views\Default_Calendar_List($this);
263 263
 		}
264 264
 
265 265
 		return null;
Please login to merge, or discard this patch.