Completed
Push — master ( 330588...338458 )
by
unknown
03:10
created
includes/admin/fields/date-picker.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 				}
96 96
 
97 97
 			} else {
98
-			    // @todo eventually if a date range picker is needed, this can be extended
98
+				// @todo eventually if a date range picker is needed, this can be extended
99 99
 			}
100 100
 
101 101
 			?>
Please login to merge, or discard this patch.
includes/admin/fields/datetime-format.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -335,7 +335,7 @@
 block discarded – undo
335 335
 	 */
336 336
 	private function meridiem() {
337 337
 
338
-	    ?>
338
+		?>
339 339
 		<div>
340 340
 			<label for="<?php echo $this->id; ?>-meridiem">
341 341
 				<?php _e( 'Meridiem', 'google-calendar-events' ); ?>
Please login to merge, or discard this patch.
includes/admin/fields/standard.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 		       value="<?php echo $this->value; ?>"
58 58
 		       class="<?php echo $this->class; ?>"<?php
59 59
 				echo $this->style ? 'style="' . $this->style . '" ' : ' ';
60
-		        echo $this->placeholder ? 'placeholder="' . $this->placeholder . '"' : ' ';
60
+				echo $this->placeholder ? 'placeholder="' . $this->placeholder . '"' : ' ';
61 61
 				echo $this->attributes; ?>/>
62 62
 		<?php
63 63
 
Please login to merge, or discard this patch.
includes/admin/menus.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -146,11 +146,11 @@
 block discarded – undo
146 146
 			$links = array();
147 147
 			$links['github']         = '<a href="' . simcal_get_url( 'github' ) . '" target="_blank" >GitHub</a>';
148 148
 			$links['documentation']  = '<a href="' . simcal_ga_campaign_url( simcal_get_url( 'docs' ), 'core-plugin', 'plugin-listing' ) . '" target="_blank" >' .
149
-			                           __( 'Documentation', 'google-calendar-events' ) . '</a>';
149
+									   __( 'Documentation', 'google-calendar-events' ) . '</a>';
150 150
 			$links['support']        = '<a href="' . simcal_get_url( 'support' ) . '" target="_blank" >' .
151
-			                           __( 'Support', 'google-calendar-events' ) . '</a>';
151
+									   __( 'Support', 'google-calendar-events' ) . '</a>';
152 152
 			$links['add-ons']        = '<a href="' . simcal_ga_campaign_url( simcal_get_url( 'add-ons' ), 'core-plugin', 'plugin-listing' ) . '" target="_blank" >' .
153
-			                           __( 'Add-ons', 'google-calendar-events' ) . '</a>';
153
+									   __( 'Add-ons', 'google-calendar-events' ) . '</a>';
154 154
 
155 155
 			return apply_filters( 'simcal_plugin_action_links', array_merge( $meta_links, $links ) );
156 156
 		}
Please login to merge, or discard this patch.
includes/admin/pages/licenses.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,8 +75,8 @@
 block discarded – undo
75 75
 			'keys' => array(
76 76
 				'title' => __( 'Premium Add-on License Keys', 'google-calendar-events' ),
77 77
 				'description' => __( 'Enter your add-on license keys below, making sure to activate each one to ensure they are valid.', 'google-calendar-events' ) .
78
-				                 '<br/><br/>' .
79
-				                 '<em>' . __( 'Your license keys are used for access to automatic upgrades and premium support.', 'google-calendar-events' ) . '</em>',
78
+								 '<br/><br/>' .
79
+								 '<em>' . __( 'Your license keys are used for access to automatic upgrades and premium support.', 'google-calendar-events' ) . '</em>',
80 80
 			),
81 81
 		);
82 82
 		return apply_filters( 'simcal_add_' . $this->option_group . '_' . $this->id .'_sections', $sections );
Please login to merge, or discard this patch.
includes/admin/post-types.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -272,9 +272,9 @@
 block discarded – undo
272 272
 
273 273
 		if ( $post_type == 'calendar' && isset( $post->ID ) ) {
274 274
 			echo '<a id="simcal-clear-cache" class="button" data-id="' . $post->ID . ' ">' .
275
-			     '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> ' .
276
-			     __( 'Clear cache', 'google-calendar-events' ) .
277
-			     '</a>';
275
+				 '<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i> ' .
276
+				 __( 'Clear cache', 'google-calendar-events' ) .
277
+				 '</a>';
278 278
 		}
279 279
 	}
280 280
 
Please login to merge, or discard this patch.
includes/events/event-builder.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -590,21 +590,21 @@  discard block
 block discarded – undo
590 590
 		if ( ! $event->whole_day ) {
591 591
 
592 592
 			$time_start = $this->calendar->datetime_separator .
593
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
594
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
595
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
596
-			              'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
597
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
598
-			              '</span> ';
593
+						  ' <span class="simcal-event-start simcal-event-start-time" ' .
594
+						  'data-event-start="' . $start->getTimestamp() . '" ' .
595
+						  'data-event-format="' . $this->calendar->time_format . '" ' .
596
+						  'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
597
+						  date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
598
+						  '</span> ';
599 599
 
600 600
 			if ( $end instanceof Carbon ) {
601 601
 
602 602
 				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
603
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
604
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
605
-				            'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
606
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
607
-				            '</span> ';
603
+							'data-event-end="' . $end->getTimestamp() . '" ' .
604
+							'data-event-format="' . $this->calendar->time_format . '" ' .
605
+							'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
606
+							date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
607
+							'</span> ';
608 608
 
609 609
 			}
610 610
 
@@ -613,23 +613,23 @@  discard block
 block discarded – undo
613 613
 		if ( $event->multiple_days ) {
614 614
 
615 615
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
616
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
617
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
618
-			          'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
619
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
620
-			          '</span> ' .
621
-			          $time_start;
616
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
617
+					  'data-event-format="' . $this->calendar->date_format . '" ' .
618
+					  'itemprop="startDate" content="' . $start->toIso8601String() . '">' .
619
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
620
+					  '</span> ' .
621
+					  $time_start;
622 622
 
623 623
 			if ( $end instanceof Carbon ) {
624 624
 
625 625
 				$output .= '-' .
626
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
627
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
628
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
629
-				           'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
630
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
631
-				           '</span> ' .
632
-				           $time_end;
626
+						   ' <span class="simcal-event-start simcal-event-end-date" ' .
627
+						   'data-event-start="' . $end->getTimestamp() . '" ' .
628
+						   'data-event-format="' . $this->calendar->date_format . '" ' .
629
+						   'itemprop="endDate" content="' . $end->toIso8601String() . '">' .
630
+						   date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
631
+						   '</span> ' .
632
+						   $time_end;
633 633
 			}
634 634
 
635 635
 		} else {
@@ -637,12 +637,12 @@  discard block
 block discarded – undo
637 637
 			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
638 638
 
639 639
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
640
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
641
-			          'data-event-format="' . $this->calendar->date_format . '">' .
642
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
643
-			          '</span> ' .
644
-			          $time_start .
645
-			          $time_end;
640
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
641
+					  'data-event-format="' . $this->calendar->date_format . '">' .
642
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
643
+					  '</span> ' .
644
+					  $time_start .
645
+					  $time_end;
646 646
 
647 647
 		}
648 648
 
@@ -695,11 +695,11 @@  discard block
 block discarded – undo
695 695
 		}
696 696
 
697 697
 		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '"' .
698
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
699
-		       'data-event-format="' . $dt_format . '"' .
700
-		       'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
701
-		       $value .
702
-		       '</span>';
698
+			   'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '"' .
699
+			   'data-event-format="' . $dt_format . '"' .
700
+			   'itemprop="' . $bound . 'Date" content="' . $event_dt->toIso8601String() . '">' .
701
+			   $value .
702
+			   '</span>';
703 703
 	}
704 704
 
705 705
 	/**
@@ -918,35 +918,35 @@  discard block
 block discarded – undo
918 918
 		$tagregexp = implode( '|', array_values( $this->tags ) );
919 919
 
920 920
 		return '/'
921
-		       . '\\['                              // Opening bracket
922
-		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
923
-		       . "($tagregexp)"                     // 2: Tag name
924
-		       . '(?![\\w-])'                       // Not followed by word character or hyphen
925
-		       . '('                                // 3: Unroll the loop: Inside the opening tag
926
-		       .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
927
-		       .     '(?:'
928
-		       .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
929
-		       .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
930
-		       .     ')*?'
931
-		       . ')'
932
-		       . '(?:'
933
-		       .     '(\\/)'                        // 4: Self closing tag ...
934
-		       .     '\\]'                          // ... and closing bracket
935
-		       . '|'
936
-		       .     '\\]'                          // Closing bracket
937
-		       .     '(?:'
938
-		       .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
939
-		       .             '[^\\[]*+'             // Not an opening bracket
940
-		       .             '(?:'
941
-		       .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
942
-		       .                 '[^\\[]*+'         // Not an opening bracket
943
-		       .             ')*+'
944
-		       .         ')'
945
-		       .         '\\[\\/\\2\\]'             // Closing tag
946
-		       .     ')?'
947
-		       . ')'
948
-		       . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
949
-		       . '/s';
921
+			   . '\\['                              // Opening bracket
922
+			   . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
923
+			   . "($tagregexp)"                     // 2: Tag name
924
+			   . '(?![\\w-])'                       // Not followed by word character or hyphen
925
+			   . '('                                // 3: Unroll the loop: Inside the opening tag
926
+			   .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
927
+			   .     '(?:'
928
+			   .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
929
+			   .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
930
+			   .     ')*?'
931
+			   . ')'
932
+			   . '(?:'
933
+			   .     '(\\/)'                        // 4: Self closing tag ...
934
+			   .     '\\]'                          // ... and closing bracket
935
+			   . '|'
936
+			   .     '\\]'                          // Closing bracket
937
+			   .     '(?:'
938
+			   .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
939
+			   .             '[^\\[]*+'             // Not an opening bracket
940
+			   .             '(?:'
941
+			   .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
942
+			   .                 '[^\\[]*+'         // Not an opening bracket
943
+			   .             ')*+'
944
+			   .         ')'
945
+			   .         '\\[\\/\\2\\]'             // Closing tag
946
+			   .     ')?'
947
+			   . ')'
948
+			   . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
949
+			   . '/s';
950 950
 	}
951 951
 
952 952
 }
Please login to merge, or discard this patch.
includes/feeds/admin/google-admin.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@  discard block
 block discarded – undo
82 82
 		return array(
83 83
 			'name' => $this->feed->name,
84 84
 			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
85
-			                 '<br/><br/>' .
86
-			                 '<em style="font-size: 14px;">' .
87
-			                 sprintf( __( '<strong>Note:</strong> A Google API key is not needed for calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong>.', 'google-calendar-events' ),
88
-				                 simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'settings-link' )
89
-			                 ) .
90
-			                 '</em>',
85
+							 '<br/><br/>' .
86
+							 '<em style="font-size: 14px;">' .
87
+							 sprintf( __( '<strong>Note:</strong> A Google API key is not needed for calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong>.', 'google-calendar-events' ),
88
+								 simcal_ga_campaign_url( simcal_get_url( 'gcal-pro' ), 'core-plugin', 'settings-link' )
89
+							 ) .
90
+							 '</em>',
91 91
 			'fields' => array(
92 92
 				'api_key' => array(
93 93
 					'type'       => 'standard',
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 					'post'        => $post_id,
274 274
 					'dismissable' => false,
275 275
 					'content'     => '<p>' .
276
-					                 '<i class="simcal-icon-warning"></i> ' .
277
-					                 sprintf(
278
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
279
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
280
-					                 ) .
281
-					                 '</p>',
276
+									 '<i class="simcal-icon-warning"></i> ' .
277
+									 sprintf(
278
+										 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
279
+										 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
280
+									 ) .
281
+									 '</p>',
282 282
 				)
283 283
 			);
284 284
 
@@ -305,11 +305,11 @@  discard block
 block discarded – undo
305 305
 						'post'        => $post_id,
306 306
 						'dismissable' => false,
307 307
 						'content'     => '<p>' .
308
-						                 '<i class="simcal-icon-warning"></i> ' .
309
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
310
-						                 '<br>' . $message . '<br>' .
311
-						                 __( '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' ) .
312
-						                 '</p>',
308
+										 '<i class="simcal-icon-warning"></i> ' .
309
+										 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
310
+										 '<br>' . $message . '<br>' .
311
+										 __( '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' ) .
312
+										 '</p>',
313 313
 					)
314 314
 				);
315 315
 
Please login to merge, or discard this patch.
includes/functions/shared.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Shared functions
4
- *
5
- * Functions shared by both back end and front end components.
6
- *
7
- * @package SimpleCalendar/Functions
8
- */
3
+	 * Shared functions
4
+	 *
5
+	 * Functions shared by both back end and front end components.
6
+	 *
7
+	 * @package SimpleCalendar/Functions
8
+	 */
9 9
 
10 10
 if ( ! defined( 'ABSPATH' ) ) {
11 11
 	exit;
Please login to merge, or discard this patch.