Completed
Push — master ( 376a76...f9d454 )
by
unknown
04:33
created
includes/update.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  */
7 7
 namespace SimpleCalendar;
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @param string $version (optional) Current plugin version, defaults to value in plugin constant.
65 65
 	 */
66
-	public function __construct( $version = SIMPLE_CALENDAR_VERSION ) {
66
+	public function __construct($version = SIMPLE_CALENDAR_VERSION) {
67 67
 		// Look for previous version in current or legacy option, null for fresh install.
68
-		$installed = get_option( 'simple-calendar_version', null );
69
-		$this->installed_ver = is_null( $installed ) ? get_option( 'gce_version', null ) : $installed;
68
+		$installed = get_option('simple-calendar_version', null);
69
+		$this->installed_ver = is_null($installed) ? get_option('gce_version', null) : $installed;
70 70
 		$this->new_ver = $version;
71 71
 
72
-		if ( version_compare( $this->installed_ver, $this->new_ver, '<' ) ) {
72
+		if (version_compare($this->installed_ver, $this->new_ver, '<')) {
73 73
 			$this->run_updates();
74 74
 		}
75 75
 	}
@@ -83,18 +83,18 @@  discard block
 block discarded – undo
83 83
 	 */
84 84
 	public function run_updates() {
85 85
 
86
-		do_action( 'simcal_before_update', $this->installed_ver );
86
+		do_action('simcal_before_update', $this->installed_ver);
87 87
 
88
-		if ( ! is_null( $this->installed_ver ) ) {
88
+		if ( ! is_null($this->installed_ver)) {
89 89
 
90
-			if ( version_compare( $this->installed_ver, $this->new_ver ) === -1 ) {
90
+			if (version_compare($this->installed_ver, $this->new_ver) === -1) {
91 91
 
92
-				$post_type = version_compare( $this->installed_ver, '3.0.0' ) === -1 ? 'gce_feed' : 'calendar';
93
-				$this->posts = $this->get_posts( $post_type );
92
+				$post_type = version_compare($this->installed_ver, '3.0.0') === -1 ? 'gce_feed' : 'calendar';
93
+				$this->posts = $this->get_posts($post_type);
94 94
 
95
-				foreach ( $this->update_path as $update_to ) {
96
-					if ( version_compare( $this->installed_ver, $update_to, '<' ) ) {
97
-						$this->update( $update_to );
95
+				foreach ($this->update_path as $update_to) {
96
+					if (version_compare($this->installed_ver, $update_to, '<')) {
97
+						$this->update($update_to);
98 98
 					}
99 99
 				}
100 100
 
@@ -109,26 +109,26 @@  discard block
 block discarded – undo
109 109
 
110 110
 		}
111 111
 
112
-		do_action( 'simcal_updated', $this->new_ver );
112
+		do_action('simcal_updated', $this->new_ver);
113 113
 
114 114
 		// Redirect to a welcome page if new install or major update.
115
-		if ( is_null( $this->installed_ver ) ) {
116
-			set_transient( '_simple-calendar_activation_redirect', 'fresh', 60 );
115
+		if (is_null($this->installed_ver)) {
116
+			set_transient('_simple-calendar_activation_redirect', 'fresh', 60);
117 117
 		} else {
118
-			$major_new = substr( $this->new_ver, 0, strrpos( $this->new_ver, '.' ) );
119
-			$major_old = substr( $this->installed_ver, 0, strrpos( $this->installed_ver, '.' ) );
120
-			if ( version_compare( $major_new, $major_old, '>' ) ) {
121
-				set_transient( '_simple-calendar_activation_redirect', 'update', 60 );
122
-			} elseif ( $major_old == $major_new ) {
123
-				$version = explode( '.', $this->new_ver );
124
-				end( $version );
125
-				if ( 0 === intval( current( $version ) ) ) {
126
-					set_transient( '_simple-calendar_activation_redirect', 'update', 60 );
118
+			$major_new = substr($this->new_ver, 0, strrpos($this->new_ver, '.'));
119
+			$major_old = substr($this->installed_ver, 0, strrpos($this->installed_ver, '.'));
120
+			if (version_compare($major_new, $major_old, '>')) {
121
+				set_transient('_simple-calendar_activation_redirect', 'update', 60);
122
+			} elseif ($major_old == $major_new) {
123
+				$version = explode('.', $this->new_ver);
124
+				end($version);
125
+				if (0 === intval(current($version))) {
126
+					set_transient('_simple-calendar_activation_redirect', 'update', 60);
127 127
 				}
128 128
 			}
129 129
 		}
130 130
 
131
-		update_option( 'simple-calendar_version', $this->new_ver );
131
+		update_option('simple-calendar_version', $this->new_ver);
132 132
 	}
133 133
 
134 134
 	/**
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
 	 *
141 141
 	 * @return array
142 142
 	 */
143
-	private function get_posts( $post_type ) {
143
+	private function get_posts($post_type) {
144 144
 
145 145
 		$posts = array();
146 146
 
147
-		if ( ! empty( $post_type ) ) {
147
+		if ( ! empty($post_type)) {
148 148
 
149 149
 			// https://core.trac.wordpress.org/ticket/18408
150
-			$posts = get_posts( array(
150
+			$posts = get_posts(array(
151 151
 				'post_type'   => $post_type,
152 152
 				'post_status' => array(
153 153
 					'draft',
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 					'trash',
159 159
 				),
160 160
 				'nopaging'    => true,
161
-			) );
161
+			));
162 162
 
163 163
 			wp_reset_postdata();
164 164
 		}
@@ -175,12 +175,12 @@  discard block
 block discarded – undo
175 175
 	 *
176 176
 	 * @param string $version
177 177
 	 */
178
-	private function update( $version ) {
178
+	private function update($version) {
179 179
 
180
-		$update_v = '\\' . __NAMESPACE__ . '\Updates\\Update_V' . str_replace( '.', '', $version );
180
+		$update_v = '\\'.__NAMESPACE__.'\Updates\\Update_V'.str_replace('.', '', $version);
181 181
 
182
-		if ( class_exists( $update_v ) ) {
183
-			new $update_v( $this->posts );
182
+		if (class_exists($update_v)) {
183
+			new $update_v($this->posts);
184 184
 		}
185 185
 	}
186 186
 
Please login to merge, or discard this patch.
includes/updates/update-v210.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  */
7 7
 namespace SimpleCalendar\Updates;
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
@@ -20,21 +20,21 @@  discard block
 block discarded – undo
20 20
 	 *
21 21
 	 * @param array $posts
22 22
 	 */
23
-	public function __construct( $posts ) {
23
+	public function __construct($posts) {
24 24
 
25
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
25
+		if ( ! empty($posts) && is_array($posts)) {
26 26
 
27
-			foreach ( $posts as $post ) {
27
+			foreach ($posts as $post) {
28 28
 
29
-				$url = get_post_meta( $post->ID, 'gce_feed_url', true );
29
+				$url = get_post_meta($post->ID, 'gce_feed_url', true);
30 30
 
31
-				if ( $url ) {
31
+				if ($url) {
32 32
 
33
-					$url = str_replace( 'https://www.google.com/calendar/feeds/', '', $url );
34
-					$url = str_replace( '/public/basic', '', $url );
35
-					$url = str_replace( '%40', '@', $url );
33
+					$url = str_replace('https://www.google.com/calendar/feeds/', '', $url);
34
+					$url = str_replace('/public/basic', '', $url);
35
+					$url = str_replace('%40', '@', $url);
36 36
 
37
-					update_post_meta( $post->ID, 'gce_feed_url', $url );
37
+					update_post_meta($post->ID, 'gce_feed_url', $url);
38 38
 				}
39 39
 
40 40
 			}
Please login to merge, or discard this patch.
includes/updates/update-v220.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  */
7 7
 namespace SimpleCalendar\Updates;
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
@@ -20,28 +20,28 @@  discard block
 block discarded – undo
20 20
 	 *
21 21
 	 * @param array $posts
22 22
 	 */
23
-	public function __construct( $posts ) {
23
+	public function __construct($posts) {
24 24
 
25
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
25
+		if ( ! empty($posts) && is_array($posts)) {
26 26
 
27
-			foreach ( $posts as $post ) {
27
+			foreach ($posts as $post) {
28 28
 
29
-				$gce_list_max_num        = get_post_meta( $post->ID, 'gce_list_max_num', true );
30
-				$gce_list_max_length     = get_post_meta( $post->ID, 'gce_list_max_length', true );
31
-				$gce_feed_start_interval = get_post_meta( $post->ID, 'gce_feed_start_interval', true );
32
-				$gce_feed_start          = get_post_meta( $post->ID, 'gce_feed_start', true );
33
-				$gce_feed_end_interval   = get_post_meta( $post->ID, 'gce_feed_end_interval', true );
34
-				$gce_feed_end            = get_post_meta( $post->ID, 'gce_feed_end', true );
29
+				$gce_list_max_num        = get_post_meta($post->ID, 'gce_list_max_num', true);
30
+				$gce_list_max_length     = get_post_meta($post->ID, 'gce_list_max_length', true);
31
+				$gce_feed_start_interval = get_post_meta($post->ID, 'gce_feed_start_interval', true);
32
+				$gce_feed_start          = get_post_meta($post->ID, 'gce_feed_start', true);
33
+				$gce_feed_end_interval   = get_post_meta($post->ID, 'gce_feed_end_interval', true);
34
+				$gce_feed_end            = get_post_meta($post->ID, 'gce_feed_end', true);
35 35
 
36
-				update_post_meta( $post->ID, 'gce_per_page_num', $gce_list_max_num );
37
-				update_post_meta( $post->ID, 'gce_events_per_page', $gce_list_max_length );
38
-				update_post_meta( $post->ID, 'gce_feed_start', $gce_feed_start_interval );
39
-				update_post_meta( $post->ID, 'gce_feed_start_num', $gce_feed_start );
40
-				update_post_meta( $post->ID, 'gce_feed_end', $gce_feed_end_interval );
41
-				update_post_meta( $post->ID, 'gce_feed_end_num', $gce_feed_end );
36
+				update_post_meta($post->ID, 'gce_per_page_num', $gce_list_max_num);
37
+				update_post_meta($post->ID, 'gce_events_per_page', $gce_list_max_length);
38
+				update_post_meta($post->ID, 'gce_feed_start', $gce_feed_start_interval);
39
+				update_post_meta($post->ID, 'gce_feed_start_num', $gce_feed_start);
40
+				update_post_meta($post->ID, 'gce_feed_end', $gce_feed_end_interval);
41
+				update_post_meta($post->ID, 'gce_feed_end_num', $gce_feed_end);
42 42
 
43 43
 				// Add new show tooltips option checked as default.
44
-				update_post_meta( $post->ID, 'gce_show_tooltips', 1 );
44
+				update_post_meta($post->ID, 'gce_show_tooltips', 1);
45 45
 			}
46 46
 
47 47
 		}
Please login to merge, or discard this patch.
includes/updates/update-v300.php 1 patch
Spacing   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use Carbon\Carbon;
10 10
 use SimpleCalendar\Post_Types;
11 11
 
12
-if ( ! defined( 'ABSPATH' ) ) {
12
+if ( ! defined('ABSPATH')) {
13 13
 	exit;
14 14
 }
15 15
 
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 	 *
24 24
 	 * @param array $posts
25 25
 	 */
26
-	public function __construct( $posts ) {
26
+	public function __construct($posts) {
27 27
 
28 28
 		Post_Types::register_taxonomies();
29 29
 		Post_Types::register_post_types();
30 30
 
31
-		if ( ! empty( $posts ) && is_array( $posts ) ) {
32
-			$this->update_posts( $posts );
31
+		if ( ! empty($posts) && is_array($posts)) {
32
+			$this->update_posts($posts);
33 33
 			$this->update_post_type();
34 34
 			$this->update_widgets();
35 35
 		}
@@ -43,201 +43,201 @@  discard block
 block discarded – undo
43 43
 	 *
44 44
 	 * @param $posts
45 45
 	 */
46
-	public function update_posts( $posts ) {
46
+	public function update_posts($posts) {
47 47
 
48
-		foreach ( $posts as $post ) {
48
+		foreach ($posts as $post) {
49 49
 
50 50
 			$post_id = $post->ID;
51 51
 
52 52
 			// Assign a feed taxonomy term (feed type) to legacy posts.
53
-			wp_set_object_terms( $post_id, 'google', 'calendar_feed' );
53
+			wp_set_object_terms($post_id, 'google', 'calendar_feed');
54 54
 
55 55
 			// Assign a calendar taxonomy term (calendar type) to legacy posts.
56
-			wp_set_object_terms( $post_id, 'default-calendar', 'calendar_type' );
56
+			wp_set_object_terms($post_id, 'default-calendar', 'calendar_type');
57 57
 
58 58
 			// Convert legacy list/grid view to default calendar view.
59
-			$display = get_post_meta( $post_id, 'gce_display_mode', true );
59
+			$display = get_post_meta($post_id, 'gce_display_mode', true);
60 60
 			$views = array();
61 61
 			$range = false;
62
-			if ( 'list' == $display ) {
62
+			if ('list' == $display) {
63 63
 				$views['default-calendar'] = 'list';
64
-			} elseif ( 'list-grouped' == $display ) {
64
+			} elseif ('list-grouped' == $display) {
65 65
 				$views['default-calendar'] = 'list';
66
-			} elseif ( 'date-range-list' == $display ) {
66
+			} elseif ('date-range-list' == $display) {
67 67
 				$views['default-calendar'] = 'list';
68 68
 				$range                     = true;
69
-			} elseif ( 'date-range-grid' == $display ) {
69
+			} elseif ('date-range-grid' == $display) {
70 70
 				$views['default-calendar'] = 'grid';
71 71
 				$range                     = true;
72 72
 			} else {
73 73
 				$views['default-calendar'] = 'grid';
74 74
 			}
75
-			update_post_meta( $post_id, '_calendar_view', $views );
75
+			update_post_meta($post_id, '_calendar_view', $views);
76 76
 
77 77
 			// List calendar settings.
78
-			$list_span  = get_post_meta( $post_id, 'gce_events_per_page', true );
79
-			$list_range = max( absint( get_post_meta( $post_id, 'gce_per_page_num', true ) ), 1 );
80
-			if ( 'days' == $list_span ) {
78
+			$list_span  = get_post_meta($post_id, 'gce_events_per_page', true);
79
+			$list_range = max(absint(get_post_meta($post_id, 'gce_per_page_num', true)), 1);
80
+			if ('days' == $list_span) {
81 81
 				$list_type = 'daily';
82
-			} elseif ( 'week' == $list_span ) {
82
+			} elseif ('week' == $list_span) {
83 83
 				$list_type = 'weekly';
84 84
 				$list_range = 1;
85
-			} elseif ( 'month' == $list_span ) {
85
+			} elseif ('month' == $list_span) {
86 86
 				$list_type = 'monthly';
87 87
 				$list_range = 1;
88 88
 			} else {
89 89
 				$list_type = 'events';
90 90
 			}
91
-			update_post_meta( $post_id, '_default_calendar_list_range_type', $list_type );
92
-			update_post_meta( $post_id, '_default_calendar_list_range_span', $list_range );
91
+			update_post_meta($post_id, '_default_calendar_list_range_type', $list_type);
92
+			update_post_meta($post_id, '_default_calendar_list_range_span', $list_range);
93 93
 
94 94
 			$calendar_begins = 'today';
95 95
 
96 96
 			// Custom calendar range.
97
-			if ( $range === true ) {
97
+			if ($range === true) {
98 98
 
99
-				$begins = get_post_meta( $post_id, 'gce_feed_range_start', true );
100
-				$ends   = get_post_meta( $post_id, 'gce_feed_range_end', true );
99
+				$begins = get_post_meta($post_id, 'gce_feed_range_start', true);
100
+				$ends   = get_post_meta($post_id, 'gce_feed_range_end', true);
101 101
 
102
-				if ( $begins && $ends ) {
103
-					update_post_meta( $post_id, '_calendar_begins', 'custom_date' );
104
-					update_post_meta( $post_id, '_calendar_begins_custom_date', $this->convert_legacy_range( $begins ) );
102
+				if ($begins && $ends) {
103
+					update_post_meta($post_id, '_calendar_begins', 'custom_date');
104
+					update_post_meta($post_id, '_calendar_begins_custom_date', $this->convert_legacy_range($begins));
105 105
 				} else {
106
-					update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
106
+					update_post_meta($post_id, '_calendar_begins', $calendar_begins);
107 107
 				}
108 108
 
109 109
 			} else {
110 110
 
111 111
 				// Legacy list calendars may have a start offset.
112
-				$offset = absint( get_post_meta( $post_id, 'gce_list_start_offset_num', true ) );
113
-				if ( 'list' == $display && $offset > 0 ) {
114
-					$calendar_begins = 'back' == get_post_meta( $post_id, 'gce_list_start_offset_direction', true ) ? 'days_before' : 'days_after';
115
-					update_post_meta( $post_id, '_calendar_begins_nth', $offset );
112
+				$offset = absint(get_post_meta($post_id, 'gce_list_start_offset_num', true));
113
+				if ('list' == $display && $offset > 0) {
114
+					$calendar_begins = 'back' == get_post_meta($post_id, 'gce_list_start_offset_direction', true) ? 'days_before' : 'days_after';
115
+					update_post_meta($post_id, '_calendar_begins_nth', $offset);
116 116
 				}
117 117
 
118
-				update_post_meta( $post_id, '_calendar_begins', $calendar_begins );
118
+				update_post_meta($post_id, '_calendar_begins', $calendar_begins);
119 119
 			}
120 120
 
121 121
 			// Earliest event.
122
-			$start_before = get_post_meta( $post_id, 'gce_feed_start', true );
123
-			$start_amt = absint( get_post_meta( $post_id, 'gce_feed_start_num', true ) );
124
-			if ( $start_amt > 0 ) {
125
-				if ( 'years' == $start_before ) {
122
+			$start_before = get_post_meta($post_id, 'gce_feed_start', true);
123
+			$start_amt = absint(get_post_meta($post_id, 'gce_feed_start_num', true));
124
+			if ($start_amt > 0) {
125
+				if ('years' == $start_before) {
126 126
 					$earliest = 'years_before';
127
-				} elseif ( 'months' == $start_before ) {
127
+				} elseif ('months' == $start_before) {
128 128
 					$earliest = 'months_before';
129 129
 				} else {
130 130
 					$earliest = 'days_before';
131 131
 				}
132
-				update_post_meta( $post_id, '_feed_earliest_event_date', $earliest );
133
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', $start_amt );
132
+				update_post_meta($post_id, '_feed_earliest_event_date', $earliest);
133
+				update_post_meta($post_id, '_feed_earliest_event_date_range', $start_amt);
134 134
 			} else {
135
-				update_post_meta( $post_id, '_feed_earliest_event_date', 'calendar_start' );
136
-				update_post_meta( $post_id, '_feed_earliest_event_date_range', 1 );
135
+				update_post_meta($post_id, '_feed_earliest_event_date', 'calendar_start');
136
+				update_post_meta($post_id, '_feed_earliest_event_date_range', 1);
137 137
 			}
138 138
 
139 139
 			// Latest event.
140
-			$end_after = get_post_meta( $post_id, 'gce_feed_end', true );
141
-			$end_amt   = absint( get_post_meta( $post_id, 'gce_feed_end_num', true ) );
142
-			if ( $end_amt > 0 ) {
143
-				if ( 'years' == $end_after ) {
140
+			$end_after = get_post_meta($post_id, 'gce_feed_end', true);
141
+			$end_amt   = absint(get_post_meta($post_id, 'gce_feed_end_num', true));
142
+			if ($end_amt > 0) {
143
+				if ('years' == $end_after) {
144 144
 					$latest = 'years_after';
145
-				} elseif ( 'months' == $end_after ) {
145
+				} elseif ('months' == $end_after) {
146 146
 					$latest = 'months_after';
147 147
 				} else {
148 148
 					$latest = 'days_after';
149 149
 				}
150
-				update_post_meta( $post_id, '_feed_latest_event_date', $latest );
151
-				update_post_meta( $post_id, '_feed_latest_event_date_range', $end_amt );
150
+				update_post_meta($post_id, '_feed_latest_event_date', $latest);
151
+				update_post_meta($post_id, '_feed_latest_event_date_range', $end_amt);
152 152
 			} else {
153
-				update_post_meta( $post_id, '_feed_latest_event_date', 'calendar_start' );
154
-				update_post_meta( $post_id, '_feed_latest_event_date_range', 1 );
153
+				update_post_meta($post_id, '_feed_latest_event_date', 'calendar_start');
154
+				update_post_meta($post_id, '_feed_latest_event_date_range', 1);
155 155
 			}
156 156
 
157 157
 			// Static calendar.
158
-			if ( false === get_post_meta( $post_id, 'gce_paging', true ) ) {
159
-				update_post_meta( $post_id, '_calendar_is_static', 'yes' );
158
+			if (false === get_post_meta($post_id, 'gce_paging', true)) {
159
+				update_post_meta($post_id, '_calendar_is_static', 'yes');
160 160
 			}
161 161
 
162 162
 			// Default calendar bubble trigger (click was unavailable before 3.0.0).
163
-			update_post_meta( $post_id, '_default_calendar_event_bubble_trigger', 'hover' );
163
+			update_post_meta($post_id, '_default_calendar_event_bubble_trigger', 'hover');
164 164
 
165 165
 			// Default calendar multiple day events.
166
-			if ( get_post_meta( $post_id, 'gce_multi_day_events', true ) ) {
167
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'yes' );
166
+			if (get_post_meta($post_id, 'gce_multi_day_events', true)) {
167
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'yes');
168 168
 			} else {
169
-				update_post_meta( $post_id, '_default_calendar_expand_multi_day_events', 'no' );
169
+				update_post_meta($post_id, '_default_calendar_expand_multi_day_events', 'no');
170 170
 			}
171 171
 
172 172
 			// Google Calendar ID.
173
-			$google_id = get_post_meta( $post_id, 'gce_feed_url', true );
174
-			update_post_meta( $post_id, '_google_calendar_id', base64_encode( trim( $google_id ) ) );
173
+			$google_id = get_post_meta($post_id, 'gce_feed_url', true);
174
+			update_post_meta($post_id, '_google_calendar_id', base64_encode(trim($google_id)));
175 175
 
176 176
 			// Google max results.
177
-			update_post_meta( $post_id, '_google_events_max_results', 2500 );
177
+			update_post_meta($post_id, '_google_events_max_results', 2500);
178 178
 
179 179
 			// Google calendar feed search terms.
180
-			$google_search = get_post_meta( $post_id, 'gce_search_query', true );
181
-			if ( ! empty( $google_search ) ) {
182
-				update_post_meta( $post_id, '_google_events_search_query', trim( $google_search ) );
180
+			$google_search = get_post_meta($post_id, 'gce_search_query', true);
181
+			if ( ! empty($google_search)) {
182
+				update_post_meta($post_id, '_google_events_search_query', trim($google_search));
183 183
 			}
184 184
 
185 185
 			// Google recurring events.
186
-			if ( get_post_meta( $post_id, 'gce_expand_recurring', true ) ) {
187
-				update_post_meta( $post_id, '_google_events_recurring', 'show' );
186
+			if (get_post_meta($post_id, 'gce_expand_recurring', true)) {
187
+				update_post_meta($post_id, '_google_events_recurring', 'show');
188 188
 			} else {
189
-				update_post_meta( $post_id, '_google_events_recurring', 'first-only' );
189
+				update_post_meta($post_id, '_google_events_recurring', 'first-only');
190 190
 			}
191 191
 
192 192
 			// Date and time format.
193
-			$date_format = get_post_meta( $post_id, 'gce_date_format', true );
194
-			if ( ! empty( $date_format ) ) {
195
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_custom_php' );
196
-				update_post_meta( $post_id, '_calendar_date_format_php', $date_format );
193
+			$date_format = get_post_meta($post_id, 'gce_date_format', true);
194
+			if ( ! empty($date_format)) {
195
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_custom_php');
196
+				update_post_meta($post_id, '_calendar_date_format_php', $date_format);
197 197
 			} else {
198
-				update_post_meta( $post_id, '_calendar_date_format_setting', 'use_site' );
198
+				update_post_meta($post_id, '_calendar_date_format_setting', 'use_site');
199 199
 			}
200
-			$time_format = get_post_meta( $post_id, 'gce_time_format', true );
201
-			if ( ! empty( $time_format ) ) {
202
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_custom_php' );
203
-				update_post_meta( $post_id, '_calendar_time_format_php', $time_format );
200
+			$time_format = get_post_meta($post_id, 'gce_time_format', true);
201
+			if ( ! empty($time_format)) {
202
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_custom_php');
203
+				update_post_meta($post_id, '_calendar_time_format_php', $time_format);
204 204
 			} else {
205
-				update_post_meta( $post_id, '_calendar_time_format_setting', 'use_site' );
205
+				update_post_meta($post_id, '_calendar_time_format_setting', 'use_site');
206 206
 			}
207
-			update_post_meta( $post_id, '_calendar_datetime_separator', '@' );
208
-			update_post_meta( $post_id, '_calendar_week_starts_on_setting', 'use_site' );
207
+			update_post_meta($post_id, '_calendar_datetime_separator', '@');
208
+			update_post_meta($post_id, '_calendar_week_starts_on_setting', 'use_site');
209 209
 
210 210
 			// Feed transient cache duration.
211
-			$cache = get_post_meta( $post_id, 'gce_cache', true );
212
-			if ( is_numeric( $cache ) ) {
213
-				$seconds = absint( $cache );
214
-				if ( $seconds < 3600 ) {
211
+			$cache = get_post_meta($post_id, 'gce_cache', true);
212
+			if (is_numeric($cache)) {
213
+				$seconds = absint($cache);
214
+				if ($seconds < 3600) {
215 215
 					$amount = $seconds / 60;
216 216
 					$unit   = 60;
217
-				} elseif ( $seconds < 86400 ) {
217
+				} elseif ($seconds < 86400) {
218 218
 					$amount = $seconds / 3600;
219 219
 					$unit   = 3600;
220
-				} elseif ( $seconds < 604800 ) {
220
+				} elseif ($seconds < 604800) {
221 221
 					$amount = $seconds / 86400;
222 222
 					$unit   = 86400;
223 223
 				} else {
224 224
 					$amount = $seconds / 604800;
225 225
 					$unit   = 604800;
226 226
 				}
227
-				$amount = max( ceil( $amount ), 1 );
228
-				update_post_meta( $post_id, '_feed_cache_user_unit', $unit );
229
-				update_post_meta( $post_id, '_feed_cache_user_amount', $amount );
230
-				update_post_meta( $post_id, '_feed_cache', $unit * $amount );
227
+				$amount = max(ceil($amount), 1);
228
+				update_post_meta($post_id, '_feed_cache_user_unit', $unit);
229
+				update_post_meta($post_id, '_feed_cache_user_amount', $amount);
230
+				update_post_meta($post_id, '_feed_cache', $unit * $amount);
231 231
 			} else {
232
-				update_post_meta( $post_id, '_feed_cache_user_unit', 2 );
233
-				update_post_meta( $post_id, '_feed_cache_user_amount', 3600 );
234
-				update_post_meta( $post_id, '_feed_cache', 7200 );
232
+				update_post_meta($post_id, '_feed_cache_user_unit', 2);
233
+				update_post_meta($post_id, '_feed_cache_user_amount', 3600);
234
+				update_post_meta($post_id, '_feed_cache', 7200);
235 235
 			}
236 236
 
237
-			$this->delete_post_meta( $post_id );
237
+			$this->delete_post_meta($post_id);
238 238
 
239 239
 			// Post updated.
240
-			update_post_meta( $post_id, '_calendar_version', '3.0.0' );
240
+			update_post_meta($post_id, '_calendar_version', '3.0.0');
241 241
 		}
242 242
 
243 243
 	}
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	 *
248 248
 	 * @param int $post_id
249 249
 	 */
250
-	public function delete_post_meta( $post_id ) {
250
+	public function delete_post_meta($post_id) {
251 251
 
252 252
 		$post_meta = array(
253 253
 			'gce_cache',
@@ -295,8 +295,8 @@  discard block
 block discarded – undo
295 295
 			'gce_time_format',
296 296
 		);
297 297
 
298
-		foreach ( $post_meta as $meta_key ) {
299
-			delete_post_meta( $post_id, $meta_key );
298
+		foreach ($post_meta as $meta_key) {
299
+			delete_post_meta($post_id, $meta_key);
300 300
 		}
301 301
 	}
302 302
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	public function update_post_type() {
307 307
 
308 308
 		global $wpdb;
309
-		$table = $wpdb->prefix . 'posts';
309
+		$table = $wpdb->prefix.'posts';
310 310
 
311 311
 		$wpdb->query(
312 312
 			"
@@ -320,23 +320,23 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	public function update_options() {
322 322
 
323
-		$old_settings          = get_option( 'gce_settings_general' );
324
-		$new_settings_feeds    = get_option( 'simple-calendar_settings_feeds' );
325
-		$new_settings_advanced = get_option( 'simple-calendar_settings_advanced' );
323
+		$old_settings          = get_option('gce_settings_general');
324
+		$new_settings_feeds    = get_option('simple-calendar_settings_feeds');
325
+		$new_settings_advanced = get_option('simple-calendar_settings_advanced');
326 326
 
327 327
 		// If empty probably using a legacy hardcoded key (no longer recommended).
328
-		$new_settings_feeds['google']['api_key'] = ! empty( $old_settings['api_key'] ) ? $old_settings['api_key'] : '';
329
-		update_option( 'simple-calendar_settings_feeds', $new_settings_feeds );
328
+		$new_settings_feeds['google']['api_key'] = ! empty($old_settings['api_key']) ? $old_settings['api_key'] : '';
329
+		update_option('simple-calendar_settings_feeds', $new_settings_feeds);
330 330
 
331
-		$new_settings_advanced['assets']['disable_css'] = ! empty( $old_settings['disable_css'] ) ? 'yes' : '';
332
-		update_option( 'simple-calendar_settings_advanced', $new_settings_advanced );
331
+		$new_settings_advanced['assets']['disable_css'] = ! empty($old_settings['disable_css']) ? 'yes' : '';
332
+		update_option('simple-calendar_settings_advanced', $new_settings_advanced);
333 333
 
334 334
 		// Delete legacy options.
335
-		delete_option( 'gce_version' );
336
-		delete_option( 'gce_options' );
337
-		delete_option( 'gce_upgrade_has_run' );
338
-		delete_option( 'gce_v240_update_notices' );
339
-		delete_option( 'gce_show_admin_install_notice' );
335
+		delete_option('gce_version');
336
+		delete_option('gce_options');
337
+		delete_option('gce_upgrade_has_run');
338
+		delete_option('gce_v240_update_notices');
339
+		delete_option('gce_show_admin_install_notice');
340 340
 	}
341 341
 
342 342
 	/**
@@ -344,26 +344,26 @@  discard block
 block discarded – undo
344 344
 	 */
345 345
 	public function update_widgets() {
346 346
 
347
-		$old_widgets = get_option( 'widget_gce_widget' );
347
+		$old_widgets = get_option('widget_gce_widget');
348 348
 
349
-		if ( ! empty( $old_widgets ) && is_array( $old_widgets ) ) {
349
+		if ( ! empty($old_widgets) && is_array($old_widgets)) {
350 350
 
351 351
 			$new_widgets = array();
352 352
 
353
-			foreach ( $old_widgets as $i => $old_widget ) {
354
-				if ( isset( $old_widget['id'] ) ) {
353
+			foreach ($old_widgets as $i => $old_widget) {
354
+				if (isset($old_widget['id'])) {
355 355
 
356
-					$id = absint( substr( $old_widget['id'], 0, strspn( $old_widget['id'], '0123456789' ) ) );
356
+					$id = absint(substr($old_widget['id'], 0, strspn($old_widget['id'], '0123456789')));
357 357
 
358
-					if ( $id > 0 ) {
359
-						$new_widgets[ $i ]['title']       = isset( $old_widget['name'] ) ? $old_widget['name'] : 'Simple Calendar';
360
-						$new_widgets[ $i ]['calendar_id'] = $id;
358
+					if ($id > 0) {
359
+						$new_widgets[$i]['title']       = isset($old_widget['name']) ? $old_widget['name'] : 'Simple Calendar';
360
+						$new_widgets[$i]['calendar_id'] = $id;
361 361
 					}
362 362
 				}
363 363
 			}
364 364
 
365
-			if ( ! empty( $new_widgets ) ) {
366
-				update_option( 'widget_gce_widget', $new_widgets );
365
+			if ( ! empty($new_widgets)) {
366
+				update_option('widget_gce_widget', $new_widgets);
367 367
 			}
368 368
 		}
369 369
 	}
@@ -377,10 +377,10 @@  discard block
 block discarded – undo
377 377
 	 *
378 378
 	 * @return string
379 379
 	 */
380
-	private function convert_legacy_range( $date ) {
381
-		$date = empty( $date ) ? date( 'm/d/Y', time() ) : $date;
382
-		$timestamp = Carbon::createFromFormat( 'm/d/Y', $date )->getTimestamp();
383
-		return date( 'Y-m-d', $timestamp );
380
+	private function convert_legacy_range($date) {
381
+		$date = empty($date) ? date('m/d/Y', time()) : $date;
382
+		$timestamp = Carbon::createFromFormat('m/d/Y', $date)->getTimestamp();
383
+		return date('Y-m-d', $timestamp);
384 384
 	}
385 385
 
386 386
 }
Please login to merge, or discard this patch.
includes/widgets.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  */
7 7
 namespace SimpleCalendar;
8 8
 
9
-if ( ! defined( 'ABSPATH' ) ) {
9
+if ( ! defined('ABSPATH')) {
10 10
 	exit;
11 11
 }
12 12
 
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function __construct() {
36 36
 
37
-		$this->widgets = apply_filters( 'simcal_get_widgets', array(
37
+		$this->widgets = apply_filters('simcal_get_widgets', array(
38 38
 			'SimpleCalendar\Widgets\Calendar'
39
-		), array() );
39
+		), array());
40 40
 
41
-		add_action( 'widgets_init', array( $this, 'register' ) );
41
+		add_action('widgets_init', array($this, 'register'));
42 42
 	}
43 43
 
44 44
 	/**
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 
51 51
 		$widgets = $this->widgets;
52 52
 
53
-		if ( ! empty( $widgets ) && is_array( $widgets ) ) {
54
-			foreach ( $widgets as $widget ) {
55
-				register_widget( $widget );
53
+		if ( ! empty($widgets) && is_array($widgets)) {
54
+			foreach ($widgets as $widget) {
55
+				register_widget($widget);
56 56
 			}
57 57
 		}
58 58
 
59
-		do_action( 'simcal_register_widgets' );
59
+		do_action('simcal_register_widgets');
60 60
 	}
61 61
 
62 62
 }
Please login to merge, or discard this patch.
includes/widgets/calendar.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use SimpleCalendar\Abstracts\Calendar_View;
10 10
 use SimpleCalendar\Abstracts\Widget;
11 11
 
12
-if ( ! defined( 'ABSPATH' ) ) {
12
+if ( ! defined('ABSPATH')) {
13 13
 	exit;
14 14
 }
15 15
 
@@ -46,18 +46,18 @@  discard block
 block discarded – undo
46 46
 	public function __construct() {
47 47
 
48 48
 		$id_base        = 'gce_widget'; // old id kept for legacy reasons
49
-		$name           = __( 'Simple Calendar', 'google-calendar-events' );
49
+		$name           = __('Simple Calendar', 'google-calendar-events');
50 50
 		$widget_options = array(
51
-			'description' => __( 'Display a calendar of events from one of your calendar feeds.', 'google-calendar-events' )
51
+			'description' => __('Display a calendar of events from one of your calendar feeds.', 'google-calendar-events')
52 52
 		);
53 53
 
54
-		parent::__construct( $id_base, $name, $widget_options );
54
+		parent::__construct($id_base, $name, $widget_options);
55 55
 
56
-		if ( is_admin() ) {
57
-			if ( ! defined( 'DOING_AJAX' ) ) {
56
+		if (is_admin()) {
57
+			if ( ! defined('DOING_AJAX')) {
58 58
 				$this->calendars = simcal_get_calendars();
59 59
 			} else {
60
-				$this->calendars = get_transient( '_simple-calendar_feed_ids' );
60
+				$this->calendars = get_transient('_simple-calendar_feed_ids');
61 61
 			}
62 62
 		}
63 63
 	}
@@ -70,18 +70,18 @@  discard block
 block discarded – undo
70 70
 	 * @param array $args     Display arguments.
71 71
 	 * @param array $instance The settings for the particular instance of the widget.
72 72
 	 */
73
-	public function widget( $args, $instance ) {
73
+	public function widget($args, $instance) {
74 74
 
75 75
 		echo $args['before_widget'];
76 76
 
77
-		if ( ! empty( $instance['title'] ) ) {
77
+		if ( ! empty($instance['title'])) {
78 78
 
79
-			echo $args['before_title']  . apply_filters( 'widget_title', $instance['title'] ) . $args['after_title'];
79
+			echo $args['before_title'].apply_filters('widget_title', $instance['title']).$args['after_title'];
80 80
 		}
81 81
 
82
-		$id = isset( $instance['calendar_id'] ) ? absint( $instance['calendar_id'] ) : 0;
83
-		if ( $id > 0 ) {
84
-			simcal_print_calendar( $id );
82
+		$id = isset($instance['calendar_id']) ? absint($instance['calendar_id']) : 0;
83
+		if ($id > 0) {
84
+			simcal_print_calendar($id);
85 85
 		}
86 86
 
87 87
 		echo $args['after_widget'];
@@ -101,12 +101,12 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @return array Settings to save or bool false to cancel saving.
103 103
 	 */
104
-	public function update( $new_instance, $old_instance ) {
104
+	public function update($new_instance, $old_instance) {
105 105
 
106 106
 		$instance = array();
107 107
 
108
-		$instance['title']          = ( ! empty( $new_instance['title'] ) )        ? sanitize_text_field( $new_instance['title'] ) : '';
109
-		$instance['calendar_id']    = ( ! empty( $new_instance['calendar_id'] ) )  ? absint( $new_instance['calendar_id'] ) : '';
108
+		$instance['title']          = ( ! empty($new_instance['title'])) ? sanitize_text_field($new_instance['title']) : '';
109
+		$instance['calendar_id']    = ( ! empty($new_instance['calendar_id'])) ? absint($new_instance['calendar_id']) : '';
110 110
 
111 111
 		return $instance;
112 112
 	}
@@ -120,34 +120,34 @@  discard block
 block discarded – undo
120 120
 	 *
121 121
 	 * @return string
122 122
 	 */
123
-	public function form( $instance ) {
123
+	public function form($instance) {
124 124
 
125
-		$title          = isset( $instance['title'] )       ? esc_attr( $instance['title'] ) : __( 'Calendar', 'google-calendar-events' );
126
-		$calendar_id    = isset( $instance['calendar_id'] ) ? esc_attr( $instance['calendar_id'] ) : '';
125
+		$title          = isset($instance['title']) ? esc_attr($instance['title']) : __('Calendar', 'google-calendar-events');
126
+		$calendar_id    = isset($instance['calendar_id']) ? esc_attr($instance['calendar_id']) : '';
127 127
 
128 128
 		?>
129 129
 		<div class="simcal-calendar-widget-settings">
130 130
 
131 131
 			<p>
132
-				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'google-calendar-events' ); ?></label>
132
+				<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'google-calendar-events'); ?></label>
133 133
 				<br>
134 134
 				<input type="text"
135
-				       name="<?php echo $this->get_field_name( 'title' ); ?>"
136
-				       id="<?php echo $this->get_field_id( 'title' ); ?>"
135
+				       name="<?php echo $this->get_field_name('title'); ?>"
136
+				       id="<?php echo $this->get_field_id('title'); ?>"
137 137
 				       class="widefat simcal-field simcal-field-standard simcal-field-text"
138 138
 				       value="<?php echo $title; ?>">
139 139
 			</p>
140 140
 
141 141
 			<p>
142
-				<label for="<?php echo $this->get_field_id( 'calendar_id' ); ?>"><?php _e( 'Calendar:', 'google-calendar-events' ); ?></label>
142
+				<label for="<?php echo $this->get_field_id('calendar_id'); ?>"><?php _e('Calendar:', 'google-calendar-events'); ?></label>
143 143
 				<br>
144
-				<?php $multiselect = count( $this->calendars ) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
145
-				<select name="<?php echo $this->get_field_name( 'calendar_id' ) ?>"
146
-				        id="<?php echo $this->get_field_id( 'calendar_id' ) ?>"
144
+				<?php $multiselect = count($this->calendars) > 15 ? ' simcal-field-select-enhanced' : ''; ?>
145
+				<select name="<?php echo $this->get_field_name('calendar_id') ?>"
146
+				        id="<?php echo $this->get_field_id('calendar_id') ?>"
147 147
 						class="simcal-field simcal-field-select<?php echo $multiselect; ?>"
148
-						data-noresults="<?php __( 'No calendars found.', 'google-calendar-events' ); ?>">
149
-						<?php foreach ( $this->calendars as $id => $name ) : ?>
150
-							<option value="<?php echo $id; ?>" <?php selected( $id, $calendar_id, true ); ?>><?php echo $name; ?></option>
148
+						data-noresults="<?php __('No calendars found.', 'google-calendar-events'); ?>">
149
+						<?php foreach ($this->calendars as $id => $name) : ?>
150
+							<option value="<?php echo $id; ?>" <?php selected($id, $calendar_id, true); ?>><?php echo $name; ?></option>
151 151
 						<?php endforeach; ?>
152 152
 				</select>
153 153
 			</p>
Please login to merge, or discard this patch.
uninstall.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -6,20 +6,20 @@  discard block
 block discarded – undo
6 6
  */
7 7
 
8 8
 // Exit if not uninstalling from WordPress.
9
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
9
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
10 10
 	exit;
11 11
 }
12 12
 
13 13
 // Get user options whether to delete settings and/or data.
14
-$settings = get_option( 'simple-calendar_settings_advanced' );
14
+$settings = get_option('simple-calendar_settings_advanced');
15 15
 
16
-if ( isset( $settings['installation']['delete_settings'] ) ) {
16
+if (isset($settings['installation']['delete_settings'])) {
17 17
 	$delete_settings = 'yes' == $settings['installation']['delete_settings'] ? true : false;
18 18
 } else {
19 19
 	$delete_settings = false;
20 20
 }
21 21
 
22
-if ( isset( $settings['installation']['erase_data'] ) ) {
22
+if (isset($settings['installation']['erase_data'])) {
23 23
 	$erase_data = 'yes' == $settings['installation']['erase_data'] ? true : false;
24 24
 } else {
25 25
 	$erase_data = false;
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 global $wpdb;
29 29
 
30 30
 // Delete settings.
31
-if ( ( $delete_settings === true ) || ( $erase_data === true ) ) {
31
+if (($delete_settings === true) || ($erase_data === true)) {
32 32
 	$wpdb->query(
33 33
 		"
34 34
 DELETE FROM $wpdb->options WHERE option_name LIKE '%simple-calendar%';
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 }
38 38
 
39 39
 // Delete calendar data.
40
-if ( $erase_data === true ) {
40
+if ($erase_data === true) {
41 41
 
42 42
 	// Delete calendar posts.
43 43
 	$wpdb->query(
@@ -47,20 +47,20 @@  discard block
 block discarded – undo
47 47
 	);
48 48
 
49 49
 	// Delete calendar postmeta.
50
-	$wpdb->query( "
50
+	$wpdb->query("
51 51
 DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;
52 52
 "
53 53
 	);
54 54
 
55 55
 	// Delete calendar terms.
56
-	$terms = get_terms( array(
56
+	$terms = get_terms(array(
57 57
 		'calendar_category',
58 58
 		'calendar_feed',
59 59
 		'calendar_type',
60
-	) );
61
-	if ( ! empty( $terms ) && is_array( $terms ) ) {
62
-		foreach ( $terms as $term ) {
63
-			wp_delete_term( $term->term_id, $term->taxonomy );
60
+	));
61
+	if ( ! empty($terms) && is_array($terms)) {
62
+		foreach ($terms as $term) {
63
+			wp_delete_term($term->term_id, $term->taxonomy);
64 64
 		}
65 65
 	}
66 66
 
Please login to merge, or discard this patch.