Completed
Push — master ( 897fc8...2501fc )
by
unknown
01:42
created
admin/includes/EDD_SL_Plugin_Updater.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 	 * @uses api_request()
65 65
 	 *
66 66
 	 * @param array   $_transient_data Update array build by WordPress.
67
-	 * @return array Modified update array with custom plugin data.
67
+	 * @return stdClass Modified update array with custom plugin data.
68 68
 	 */
69 69
 	function check_update( $_transient_data ) {
70 70
 
Please login to merge, or discard this patch.
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -26,16 +26,16 @@  discard block
 block discarded – undo
26 26
 	 * @param array   $_api_data    Optional data to send with API calls.
27 27
 	 * @return void
28 28
 	 */
29
-	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
30
-		$this->api_url  = trailingslashit( $_api_url );
29
+	function __construct($_api_url, $_plugin_file, $_api_data = null) {
30
+		$this->api_url  = trailingslashit($_api_url);
31 31
 		$this->api_data = $_api_data;
32
-		$this->name     = plugin_basename( $_plugin_file );
33
-		$this->slug     = basename( $_plugin_file, '.php' );
32
+		$this->name     = plugin_basename($_plugin_file);
33
+		$this->slug     = basename($_plugin_file, '.php');
34 34
 		$this->version  = $_api_data['version'];
35 35
 
36 36
 		// Set up hooks.
37 37
 		$this->init();
38
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
38
+		add_action('admin_init', array($this, 'show_changelog'));
39 39
 	}
40 40
 
41 41
 	/**
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function init() {
49 49
 
50
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
51
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
50
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
51
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
52 52
 
53
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
53
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
54 54
 	}
55 55
 
56 56
 	/**
@@ -66,34 +66,34 @@  discard block
 block discarded – undo
66 66
 	 * @param array   $_transient_data Update array build by WordPress.
67 67
 	 * @return array Modified update array with custom plugin data.
68 68
 	 */
69
-	function check_update( $_transient_data ) {
69
+	function check_update($_transient_data) {
70 70
 
71 71
 		global $pagenow;
72 72
 
73
-		if ( ! is_object( $_transient_data ) ) {
73
+		if (!is_object($_transient_data)) {
74 74
 			$_transient_data = new stdClass;
75 75
 		}
76 76
 
77
-		if ( 'plugins.php' == $pagenow && is_multisite() ) {
77
+		if ('plugins.php' == $pagenow && is_multisite()) {
78 78
 			return $_transient_data;
79 79
 		}
80 80
 
81
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
81
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
82 82
 
83
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
83
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
84 84
 
85
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
85
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
86 86
 
87 87
 				$this->did_check = true;
88 88
 
89
-				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
89
+				if (version_compare($this->version, $version_info->new_version, '<')) {
90 90
 
91
-					$_transient_data->response[ $this->name ] = $version_info;
91
+					$_transient_data->response[$this->name] = $version_info;
92 92
 
93 93
 				}
94 94
 
95 95
 				$_transient_data->last_checked = time();
96
-				$_transient_data->checked[ $this->name ] = $this->version;
96
+				$_transient_data->checked[$this->name] = $this->version;
97 97
 
98 98
 			}
99 99
 
@@ -108,84 +108,84 @@  discard block
 block discarded – undo
108 108
 	 * @param string  $file
109 109
 	 * @param array   $plugin
110 110
 	 */
111
-	public function show_update_notification( $file, $plugin ) {
111
+	public function show_update_notification($file, $plugin) {
112 112
 
113
-		if ( ! current_user_can( 'update_plugins' ) ) {
113
+		if (!current_user_can('update_plugins')) {
114 114
 			return;
115 115
 		}
116 116
 
117
-		if ( ! is_multisite() ) {
117
+		if (!is_multisite()) {
118 118
 			return;
119 119
 		}
120 120
 
121
-		if ( $this->name != $file ) {
121
+		if ($this->name != $file) {
122 122
 			return;
123 123
 		}
124 124
 
125 125
 		// Remove our filter on the site transient
126
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
126
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
127 127
 
128
-		$update_cache = get_site_transient( 'update_plugins' );
128
+		$update_cache = get_site_transient('update_plugins');
129 129
 
130
-		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
130
+		if (!is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
131 131
 
132
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
133
-			$version_info = get_transient( $cache_key );
132
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
133
+			$version_info = get_transient($cache_key);
134 134
 
135
-			if ( false === $version_info ) {
135
+			if (false === $version_info) {
136 136
 
137
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
137
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
138 138
 
139
-				set_transient( $cache_key, $version_info, 3600 );
139
+				set_transient($cache_key, $version_info, 3600);
140 140
 			}
141 141
 
142 142
 
143
-			if ( ! is_object( $version_info ) ) {
143
+			if (!is_object($version_info)) {
144 144
 				return;
145 145
 			}
146 146
 
147
-			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
147
+			if (version_compare($this->version, $version_info->new_version, '<')) {
148 148
 
149
-				$update_cache->response[ $this->name ] = $version_info;
149
+				$update_cache->response[$this->name] = $version_info;
150 150
 
151 151
 			}
152 152
 
153 153
 			$update_cache->last_checked = time();
154
-			$update_cache->checked[ $this->name ] = $this->version;
154
+			$update_cache->checked[$this->name] = $this->version;
155 155
 
156
-			set_site_transient( 'update_plugins', $update_cache );
156
+			set_site_transient('update_plugins', $update_cache);
157 157
 
158 158
 		} else {
159 159
 
160
-			$version_info = $update_cache->response[ $this->name ];
160
+			$version_info = $update_cache->response[$this->name];
161 161
 
162 162
 		}
163 163
 
164 164
 		// Restore our filter
165
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
165
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
166 166
 
167
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
167
+		if (!empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
168 168
 
169 169
 			// build a plugin list row, with update notification
170
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
171
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
170
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
171
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
172 172
 
173
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
173
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
174 174
 
175
-			if ( empty( $version_info->download_link ) ) {
175
+			if (empty($version_info->download_link)) {
176 176
 				printf(
177
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'lasso' ),
178
-					esc_html( $version_info->name ),
179
-					esc_url( $changelog_link ),
180
-					esc_html( $version_info->new_version )
177
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'lasso'),
178
+					esc_html($version_info->name),
179
+					esc_url($changelog_link),
180
+					esc_html($version_info->new_version)
181 181
 				);
182 182
 			} else {
183 183
 				printf(
184
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'lasso' ),
185
-					esc_html( $version_info->name ),
186
-					esc_url( $changelog_link ),
187
-					esc_html( $version_info->new_version ),
188
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
184
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'lasso'),
185
+					esc_html($version_info->name),
186
+					esc_url($changelog_link),
187
+					esc_html($version_info->new_version),
188
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
189 189
 				);
190 190
 			}
191 191
 
@@ -204,16 +204,16 @@  discard block
 block discarded – undo
204 204
 	 * @param object  $_args
205 205
 	 * @return object $_data
206 206
 	 */
207
-	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
207
+	function plugins_api_filter($_data, $_action = '', $_args = null) {
208 208
 
209 209
 
210
-		if ( $_action != 'plugin_information' ) {
210
+		if ($_action != 'plugin_information') {
211 211
 
212 212
 			return $_data;
213 213
 
214 214
 		}
215 215
 
216
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
216
+		if (!isset($_args->slug) || ($_args->slug != $this->slug)) {
217 217
 
218 218
 			return $_data;
219 219
 
@@ -228,9 +228,9 @@  discard block
 block discarded – undo
228 228
 			)
229 229
 		);
230 230
 
231
-		$api_response = $this->api_request( 'plugin_information', $to_send );
231
+		$api_response = $this->api_request('plugin_information', $to_send);
232 232
 
233
-		if ( false !== $api_response ) {
233
+		if (false !== $api_response) {
234 234
 			$_data = $api_response;
235 235
 		}
236 236
 
@@ -245,9 +245,9 @@  discard block
 block discarded – undo
245 245
 	 * @param string  $url
246 246
 	 * @return object $array
247 247
 	 */
248
-	function http_request_args( $args, $url ) {
248
+	function http_request_args($args, $url) {
249 249
 		// If it is an https request and we are performing a package download, disable ssl verification
250
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
250
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
251 251
 			$args['sslverify'] = false;
252 252
 		}
253 253
 		return $args;
@@ -264,40 +264,40 @@  discard block
 block discarded – undo
264 264
 	 * @param array   $_data   Parameters for the API action.
265 265
 	 * @return false||object
266 266
 	 */
267
-	private function api_request( $_action, $_data ) {
267
+	private function api_request($_action, $_data) {
268 268
 
269 269
 		global $wp_version;
270 270
 
271
-		$data = array_merge( $this->api_data, $_data );
271
+		$data = array_merge($this->api_data, $_data);
272 272
 
273
-		if ( $data['slug'] != $this->slug )
273
+		if ($data['slug'] != $this->slug)
274 274
 			return;
275 275
 
276
-		if ( empty( $data['license'] ) )
276
+		if (empty($data['license']))
277 277
 			return;
278 278
 
279
-		if ( $this->api_url == home_url() ) {
279
+		if ($this->api_url == home_url()) {
280 280
 			return false; // Don't allow a plugin to ping itself
281 281
 		}
282 282
 
283 283
 		$api_params = array(
284 284
 			'edd_action' => 'get_version',
285 285
 			'license'    => $data['license'],
286
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
287
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
286
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
287
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
288 288
 			'slug'       => $data['slug'],
289 289
 			'author'     => $data['author'],
290 290
 			'url'        => home_url()
291 291
 		);
292 292
 
293
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
293
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
294 294
 
295
-		if ( ! is_wp_error( $request ) ) {
296
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
295
+		if (!is_wp_error($request)) {
296
+			$request = json_decode(wp_remote_retrieve_body($request));
297 297
 		}
298 298
 
299
-		if ( $request && isset( $request->sections ) ) {
300
-			$request->sections = maybe_unserialize( $request->sections );
299
+		if ($request && isset($request->sections)) {
300
+			$request->sections = maybe_unserialize($request->sections);
301 301
 		} else {
302 302
 			$request = false;
303 303
 		}
@@ -308,26 +308,26 @@  discard block
 block discarded – undo
308 308
 	public function show_changelog() {
309 309
 
310 310
 
311
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
311
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
312 312
 			return;
313 313
 		}
314 314
 
315
-		if ( empty( $_REQUEST['plugin'] ) ) {
315
+		if (empty($_REQUEST['plugin'])) {
316 316
 			return;
317 317
 		}
318 318
 
319
-		if ( empty( $_REQUEST['slug'] ) ) {
319
+		if (empty($_REQUEST['slug'])) {
320 320
 			return;
321 321
 		}
322 322
 
323
-		if ( ! current_user_can( 'update_plugins' ) ) {
324
-			wp_die( __( 'You do not have permission to install plugin updates', 'lasso' ), __( 'Error', 'lasso' ), array( 'response' => 403 ) );
323
+		if (!current_user_can('update_plugins')) {
324
+			wp_die(__('You do not have permission to install plugin updates', 'lasso'), __('Error', 'lasso'), array('response' => 403));
325 325
 		}
326 326
 
327
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
327
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
328 328
 
329
-		if ( $response && isset( $response->sections['changelog'] ) ) {
330
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
329
+		if ($response && isset($response->sections['changelog'])) {
330
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
331 331
 		}
332 332
 
333 333
 
Please login to merge, or discard this patch.
includes/lasso_autoloader.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * Loads the class file for a given class name.
63 63
 	 *
64 64
 	 * @param string $class The fully-qualified class name.
65
-	 * @return mixed The mapped file name on success, or boolean false on
65
+	 * @return string|false The mapped file name on success, or boolean false on
66 66
 	 * failure.
67 67
 	 */
68 68
 	public function loadClass($class) {
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 *
100 100
 	 * @param string $prefix The namespace prefix.
101 101
 	 * @param string $relative_class The relative class name.
102
-	 * @return mixed Boolean false if no mapped file can be loaded, or the
102
+	 * @return false|string Boolean false if no mapped file can be loaded, or the
103 103
 	 * name of the mapped file that was loaded.
104 104
 	 */
105 105
 	protected function loadMappedFile($prefix, $relative_class) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@
 block discarded – undo
40 40
 	 */
41 41
 	public function addNamespace($prefix, $base_dir, $prepend = false) {
42 42
 		// normalize namespace prefix
43
-		$prefix = trim($prefix, '\\') . '\\';
43
+		$prefix = trim($prefix, '\\').'\\';
44 44
 
45 45
 		// normalize the base directory with a trailing separator
46
-		$base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
46
+		$base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/';
47 47
 
48 48
 		// initialize the namespace prefix array
49 49
 		if (isset($this->prefixes[$prefix]) === false) {
Please login to merge, or discard this patch.
internal-api/auth.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@  discard block
 block discarded – undo
49 49
 	 *
50 50
 	 * @param string $action The AJAX action we are processing.
51 51
 	 * @param string|object $callback_class The class to use for the callback. Either the name of the class or an instance of that class.
52
-	 * @param string $method The name of the callback method.
53 52
 
54 53
 	 */
55 54
 	public function __construct( $action, $callback_class) {
@@ -123,7 +122,7 @@  discard block
 block discarded – undo
123 122
 	 *
124 123
 	 * @access protected
125 124
 	 *
126
-	 * @return bool
125
+	 * @return boolean|null
127 126
 	 */
128 127
 	protected function if_implements() {
129 128
 
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -52,28 +52,28 @@  discard block
 block discarded – undo
52 52
 	 * @param string $method The name of the callback method.
53 53
 
54 54
 	 */
55
-	public function __construct( $action, $callback_class) {
56
-		if ( ! is_object( $callback_class ) ) {
55
+	public function __construct($action, $callback_class) {
56
+		if (!is_object($callback_class)) {
57 57
 			$this->callback_instance = new $callback_class;
58
-		}else{
58
+		} else {
59 59
 			$this->callback_instance = $callback_class;
60 60
 		}
61 61
 
62
-		if ( $this->check_nonce() ) {
63
-			if ( is_object( $this->callback_instance ) && $this->if_implements() ) {
64
-				if ( $this->other_auth_checks( $action ) ) {
62
+		if ($this->check_nonce()) {
63
+			if (is_object($this->callback_instance) && $this->if_implements()) {
64
+				if ($this->other_auth_checks($action)) {
65 65
 					$this->status_code = 200;
66 66
 				} else {
67
-					$this->error_message = __( 'Unauthorized action', 'lasso' );
67
+					$this->error_message = __('Unauthorized action', 'lasso');
68 68
 					$this->status_code   = 401;
69 69
 				}
70 70
 			} else {
71
-				$this->error_message = __( 'All callback classes used for processing the Editus Internal API must implement the lasso\internal_api\api_action interface.', 'lasso' );
71
+				$this->error_message = __('All callback classes used for processing the Editus Internal API must implement the lasso\internal_api\api_action interface.', 'lasso');
72 72
 				$this->status_code   = 401;
73 73
 			}
74 74
 		} else {
75 75
 			$this->status_code   = 401;
76
-			$this->error_message = __( 'Nonce invalid', 'lasso' );
76
+			$this->error_message = __('Nonce invalid', 'lasso');
77 77
 		}
78 78
 
79 79
 	}
@@ -89,20 +89,20 @@  discard block
 block discarded – undo
89 89
 	 *
90 90
 	 * @return bool True if auth checks were all postive.
91 91
 	 */
92
-	protected function other_auth_checks( $action ) {
92
+	protected function other_auth_checks($action) {
93 93
 		$auth_callbacks = $this->callback_instance->auth_callbacks();
94 94
 
95
-		if ( is_array( $auth_callbacks ) && isset( $auth_callbacks[ $action ] ) && is_array( $auth_callbacks[ $action ] ) ) {
96
-			$checks = $auth_callbacks[ $action ];
97
-			if ( is_array( $checks ) ) {
98
-				foreach ( $checks as $check ) {
99
-					if ( is_array( $check ) ) {
100
-						$check = call_user_func( array( $check[0], $check[1] ) );
95
+		if (is_array($auth_callbacks) && isset($auth_callbacks[$action]) && is_array($auth_callbacks[$action])) {
96
+			$checks = $auth_callbacks[$action];
97
+			if (is_array($checks)) {
98
+				foreach ($checks as $check) {
99
+					if (is_array($check)) {
100
+						$check = call_user_func(array($check[0], $check[1]));
101 101
 					} else {
102
-						$check = call_user_func( $check );
102
+						$check = call_user_func($check);
103 103
 					}
104 104
 
105
-					if ( false === $check ) {
105
+					if (false === $check) {
106 106
 						return false;
107 107
 
108 108
 					}
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	protected function if_implements() {
129 129
 
130
-		$implements = class_implements( $this->callback_instance );
131
-		if ( is_array( $implements ) && in_array( 'lasso\internal_api\api_action', $implements ) ) {
130
+		$implements = class_implements($this->callback_instance);
131
+		if (is_array($implements) && in_array('lasso\internal_api\api_action', $implements)) {
132 132
 			return true;
133 133
 
134 134
 		}
@@ -147,13 +147,13 @@  discard block
 block discarded – undo
147 147
 	 * @return bool
148 148
 	 */
149 149
 	protected function check_nonce() {
150
-		if ( isset( $this->callback_instance->nonce_action ) ) {
150
+		if (isset($this->callback_instance->nonce_action)) {
151 151
 			$nonce = $this->callback_instance->nonce_action;
152
-		}else{
152
+		} else {
153 153
 			$nonce = 'lasso_editor';
154 154
 		}
155 155
 
156
-		return wp_verify_nonce( $_POST[ 'nonce' ], $nonce );
156
+		return wp_verify_nonce($_POST['nonce'], $nonce);
157 157
 
158 158
 	}
159 159
 
Please login to merge, or discard this patch.
internal-api/route.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -97,6 +97,7 @@
 block discarded – undo
97 97
 	 *
98 98
 	 * @access protected
99 99
 	 *
100
+	 * @param string $action
100 101
 	 * @return array
101 102
 	 */
102 103
 	protected static function find_callback( $action ) {
Please login to merge, or discard this patch.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -24,35 +24,35 @@  discard block
 block discarded – undo
24 24
 		global $wp_query;
25 25
 
26 26
 		//get action, and if set, possibly act
27
-		$action = $wp_query->get( 'action' );
28
-		if ( $action && strpos( $_SERVER['REQUEST_URI'], 'lasso-internal-api' ) ) {
27
+		$action = $wp_query->get('action');
28
+		if ($action && strpos($_SERVER['REQUEST_URI'], 'lasso-internal-api')) {
29 29
 
30
-			$response = __( 'Editus API Error.', 'lasso' );
30
+			$response = __('Editus API Error.', 'lasso');
31 31
 			$code = 400;
32 32
 
33 33
 			//see if have a nonce. Will verify it in auth class.
34
-			if ( isset( $_POST[ 'nonce' ] ) ) {
34
+			if (isset($_POST['nonce'])) {
35 35
 
36
-				$callback = self::find_callback( strip_tags( $action ) );
37
-				if ( is_int( $callback )  ) {
36
+				$callback = self::find_callback(strip_tags($action));
37
+				if (is_int($callback)) {
38 38
 					$code = $callback;
39
-				}elseif( ! class_exists( $callback['class'] ) ) {
39
+				}elseif (!class_exists($callback['class'])) {
40 40
 					$code = 415;
41
-				}else {
42
-					$action = str_replace( '-', '_', $action );
41
+				} else {
42
+					$action = str_replace('-', '_', $action);
43 43
 					$callback_instance = new $callback['class'];
44
-					$auth              = self::auth( $action, $callback_instance, $callback['method'] );
45
-					if ( 200 == $auth->status_code && is_array( $callback ) ) {
44
+					$auth              = self::auth($action, $callback_instance, $callback['method']);
45
+					if (200 == $auth->status_code && is_array($callback)) {
46 46
 						$code = 200;
47
-						$data = new find_data( $callback_instance, $action );
48
-						if ( is_array( $data->data ) && ! empty( $data->data ) ) {
49
-							$response = self::route( $action, $callback_instance, $callback['method'], $data->data );
47
+						$data = new find_data($callback_instance, $action);
48
+						if (is_array($data->data) && !empty($data->data)) {
49
+							$response = self::route($action, $callback_instance, $callback['method'], $data->data);
50 50
 						} else {
51 51
 							$code = 500;
52 52
 						}
53 53
 
54 54
 					} else {
55
-						if ( isset( $auth->error_message ) && is_string( $auth->error_message ) ) {
55
+						if (isset($auth->error_message) && is_string($auth->error_message)) {
56 56
 							$response = $auth->error_message;
57 57
 						}
58 58
 
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
 
62 62
 				}
63 63
 
64
-			}else{
64
+			} else {
65 65
 				$code = 401;
66
-				$response = __( 'Nonce not set.', 'lasso' );
66
+				$response = __('Nonce not set.', 'lasso');
67 67
 			}
68 68
 
69
-			self::respond( $response, $code );
69
+			self::respond($response, $code);
70 70
 
71 71
 		}
72 72
 
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	 *
86 86
 	 * @return \lasso\internal_api\auth
87 87
 	 */
88
-	protected static function auth( $action, $callback ) {
89
-		return new auth( $action, $callback );
88
+	protected static function auth($action, $callback) {
89
+		return new auth($action, $callback);
90 90
 
91 91
 	}
92 92
 
@@ -99,15 +99,15 @@  discard block
 block discarded – undo
99 99
 	 *
100 100
 	 * @return array
101 101
 	 */
102
-	protected static function find_callback( $action ) {
103
-		if ( $action ) {
104
-			$parts = explode( '_', $action );
102
+	protected static function find_callback($action) {
103
+		if ($action) {
104
+			$parts = explode('_', $action);
105 105
 
106
-			if ( isset( $parts[0] ) && isset( $parts[1] ) && isset( $parts[2] ) ) {
107
-				$class     = str_replace( '-', '_', $parts[1] );
106
+			if (isset($parts[0]) && isset($parts[1]) && isset($parts[2])) {
107
+				$class     = str_replace('-', '_', $parts[1]);
108 108
 
109 109
 				$class = "\\lasso\\{$parts[0]}\\{$class}";
110
-				$callback  = str_replace( '-', '_', $parts[2] );
110
+				$callback  = str_replace('-', '_', $parts[2]);
111 111
 
112 112
 				return array(
113 113
 					'class'  => $class,
@@ -136,9 +136,9 @@  discard block
 block discarded – undo
136 136
 	 *
137 137
 	 * @return mixed
138 138
 	 */
139
-	protected static function route( $action, $callback, $method, $data ) {
140
-		if (  method_exists( $callback, $method ) ) {
141
-			$response = call_user_func( array( $callback, $method ), $data  );
139
+	protected static function route($action, $callback, $method, $data) {
140
+		if (method_exists($callback, $method)) {
141
+			$response = call_user_func(array($callback, $method), $data);
142 142
 
143 143
 			return $response;
144 144
 
@@ -156,29 +156,29 @@  discard block
 block discarded – undo
156 156
 	 * @param array|string $response The response message to send.
157 157
 	 * @param bool|int $code Response code or bool. If is bool, response code will be 200 or 401
158 158
 	 */
159
-	protected static function respond( $response, $code ) {
160
-		if ( true === $code ) {
159
+	protected static function respond($response, $code) {
160
+		if (true === $code) {
161 161
 			$code = 200;
162 162
 		}
163 163
 
164
-		if ( false == $code ) {
164
+		if (false == $code) {
165 165
 			$code = 401;
166 166
 		}
167 167
 
168
-		if ( is_string( $response ) ) {
168
+		if (is_string($response)) {
169 169
 			$data[] = $response;
170
-		}elseif( is_array( $response ) ) {
170
+		}elseif (is_array($response)) {
171 171
 			$data = $response;
172
-		}else{
172
+		} else {
173 173
 			$data[] = $code;
174 174
 		}
175 175
 
176
-		status_header( $code );
176
+		status_header($code);
177 177
 		nocache_headers();
178
-		if ( 200 == $code ) {
179
-			wp_send_json_success( $data );
180
-		}else{
181
-			wp_send_json_error( $data );
178
+		if (200 == $code) {
179
+			wp_send_json_success($data);
180
+		} else {
181
+			wp_send_json_error($data);
182 182
 		}
183 183
 
184 184
 	}
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 	 */
201 201
 	public static function init() {
202 202
 
203
-		if ( ! self::$instance ) {
203
+		if (!self::$instance) {
204 204
 			self::$instance = new self;
205 205
 		}
206 206
 
Please login to merge, or discard this patch.
bootstrap.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 /*----------------------------------------------------------------------------*
10 10
  * Register Autoloader
11 11
  *----------------------------------------------------------------------------*/
12
-include_once( LASSO_DIR . '/includes/lasso_autoloader.php' );
12
+include_once(LASSO_DIR.'/includes/lasso_autoloader.php');
13 13
 $loader = new lasso_autoloader();
14 14
 
15 15
 $loader->register();
@@ -19,19 +19,19 @@  discard block
 block discarded – undo
19 19
  *----------------------------------------------------------------------------*/
20 20
 //require_once plugin_dir_path( __FILE__ ) . 'public/class-lasso.php';
21 21
 
22
-$loader->addNamespace('lasso', LASSO_DIR . 'includes' );
23
-$loader->addNamespace('lasso_public_facing', LASSO_DIR . 'public/includes' );
24
-$loader->addNamespace('lasso\internal_api', LASSO_DIR . 'internal-api' );
22
+$loader->addNamespace('lasso', LASSO_DIR.'includes');
23
+$loader->addNamespace('lasso_public_facing', LASSO_DIR.'public/includes');
24
+$loader->addNamespace('lasso\internal_api', LASSO_DIR.'internal-api');
25 25
 new lasso\internal_api\end_points();
26 26
 
27
-register_activation_hook( __FILE__, array( 'lasso_public_facing\lasso', 'activate' ) );
28
-register_deactivation_hook( __FILE__, array( 'lasso_public_facing\lasso', 'deactivate' ) );
27
+register_activation_hook(__FILE__, array('lasso_public_facing\lasso', 'activate'));
28
+register_deactivation_hook(__FILE__, array('lasso_public_facing\lasso', 'deactivate'));
29 29
 
30
-add_action( 'plugins_loaded', array( 'lasso_public_facing\lasso', 'get_instance' ) );
30
+add_action('plugins_loaded', array('lasso_public_facing\lasso', 'get_instance'));
31 31
 
32 32
 //load tour
33
-add_action(  'init', function() {
34
-	if (! is_admin() && is_user_logged_in() ) {
33
+add_action('init', function() {
34
+	if (!is_admin() && is_user_logged_in()) {
35 35
 		new \lasso_public_facing\tour();
36 36
 	}
37 37
 });
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
  * Dashboard and Administrative Functionality
42 42
  *----------------------------------------------------------------------------*/
43 43
 
44
-if ( is_admin() ) {
45
-	$loader->addNamespace('lasso_admin', LASSO_DIR . 'admin/includes' );
46
-	add_action( 'plugins_loaded', array( 'lasso_admin\load_admin', 'get_instance' ) );
44
+if (is_admin()) {
45
+	$loader->addNamespace('lasso_admin', LASSO_DIR.'admin/includes');
46
+	add_action('plugins_loaded', array('lasso_admin\load_admin', 'get_instance'));
47 47
 
48 48
 }
Please login to merge, or discard this patch.
includes/process/delete.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
 	 *
26 26
 	 * @since 1.0
27 27
 	 */
28
-	public function post( $data ) {
28
+	public function post($data) {
29 29
 
30
-		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
30
+		$postid = isset($data['postid']) ? $data['postid'] : false;
31 31
 
32 32
 		// bail out if teh current user can't publish posts
33
-		if ( !lasso_user_can( 'delete_post', $postid ) )
33
+		if (!lasso_user_can('delete_post', $postid))
34 34
 			return;
35 35
 
36 36
 		$args = array(
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 			'post_status' 	=> 'trash'
39 39
 		);
40 40
 
41
-		wp_update_post( apply_filters( 'lasso_object_deleted_args', $args ) );
41
+		wp_update_post(apply_filters('lasso_object_deleted_args', $args));
42 42
 
43
-		do_action( 'lasso_object_deleted', $postid, get_current_user_ID() );
43
+		do_action('lasso_object_deleted', $postid, get_current_user_ID());
44 44
 
45 45
 		return true;
46 46
 	}
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 	 *
53 53
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
54 54
 	 */
55
-	public static function params(){
56
-		$params[ 'process_delete_post' ] = array(
55
+	public static function params() {
56
+		$params['process_delete_post'] = array(
57 57
 			'postid' => 'absint',
58 58
 		);
59 59
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * @return array Array of additional functions to use to authorize action.
69 69
 	 */
70 70
 	public static function auth_callbacks() {
71
-		$params[ 'process_delete_post' ] = array(
71
+		$params['process_delete_post'] = array(
72 72
 			'lasso_user_can'
73 73
 		);
74 74
 
Please login to merge, or discard this patch.
includes/process/map.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -28,27 +28,27 @@  discard block
 block discarded – undo
28 28
 	 *
29 29
 	 * @return bool Always returns true.
30 30
 	 */
31
-	public function save( $data ) {
31
+	public function save($data) {
32 32
 
33
-		$postid     	= isset( $data['postid'] ) ? $data['postid'] : false;
34
-		$locations    	= isset( $data['ase-map-component-locations'] ) ? $data['ase-map-component-locations'] : false;
35
-		$start_point    = isset( $data['ase-map-component-start-point'] ) ? $data['ase-map-component-start-point']: false;
36
-		$zoom       	= isset( $data['ase-map-component-zoom'] ) ? $data['ase-map-component-zoom' ] : false;
33
+		$postid     	= isset($data['postid']) ? $data['postid'] : false;
34
+		$locations = isset($data['ase-map-component-locations']) ? $data['ase-map-component-locations'] : false;
35
+		$start_point = isset($data['ase-map-component-start-point']) ? $data['ase-map-component-start-point'] : false;
36
+		$zoom       	= isset($data['ase-map-component-zoom']) ? $data['ase-map-component-zoom'] : false;
37 37
 
38
-		if ( is_array( $locations ) ) {
39
-			delete_post_meta( $postid, 'ase_map_component_locations' );
38
+		if (is_array($locations)) {
39
+			delete_post_meta($postid, 'ase_map_component_locations');
40 40
 
41 41
 			// update locations if set
42
-			foreach ( $locations as $location ) {
43
-				$point = json_decode( urldecode( $location ), true );
44
-				add_post_meta( $postid, 'ase_map_component_locations', $point );
42
+			foreach ($locations as $location) {
43
+				$point = json_decode(urldecode($location), true);
44
+				add_post_meta($postid, 'ase_map_component_locations', $point);
45 45
 			}
46 46
 
47 47
 			// udpate start point
48
-			update_post_meta( $postid, 'ase_map_component_start_point', $start_point );
48
+			update_post_meta($postid, 'ase_map_component_start_point', $start_point);
49 49
 
50 50
 			// update zoom
51
-			update_post_meta( $postid, 'ase_map_component_zoom', $zoom );
51
+			update_post_meta($postid, 'ase_map_component_zoom', $zoom);
52 52
 		}
53 53
 
54 54
 		return true;
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 	 *
63 63
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
64 64
 	 */
65
-	public static function params(){
66
-		$params[ 'process_map_save' ] = array(
65
+	public static function params() {
66
+		$params['process_map_save'] = array(
67 67
 			'postid' => 'absint',
68 68
 			'ase-map-component-locations' => 'lasso_sanitize_data',
69 69
 			'ase-map-component-start-point' => array(
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @return array Array of additional functions to use to authorize action.
88 88
 	 */
89 89
 	public static function auth_callbacks() {
90
-		$params[ 'process_map_save' ] = array(
90
+		$params['process_map_save'] = array(
91 91
 			'lasso_user_can'
92 92
 		);
93 93
 
Please login to merge, or discard this patch.
includes/process/revision.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
27 27
 	 *
28 28
 	 * @return array
29 29
 	 */
30
-	public static function get( $data ) {
30
+	public static function get($data) {
31 31
 		$args = array();
32
-		if ( isset( $data[ 'limit' ] ) ) {
33
-			$args[ 'posts_per_page' ] = $data[ 'limit' ];
34
-		}else{
35
-			$args[ 'posts_per_page' ] = 6; // we start at revision 0
32
+		if (isset($data['limit'])) {
33
+			$args['posts_per_page'] = $data['limit'];
34
+		} else {
35
+			$args['posts_per_page'] = 6; // we start at revision 0
36 36
 		}
37 37
 
38
-		$revisions = wp_get_post_revisions( $data[ 'postid' ], $args  );
39
-		if ( is_array( $revisions )  && ! empty( $revisions )  ) {
40
-			self::set_revisions( $data[ 'postid' ], $revisions );
38
+		$revisions = wp_get_post_revisions($data['postid'], $args);
39
+		if (is_array($revisions) && !empty($revisions)) {
40
+			self::set_revisions($data['postid'], $revisions);
41 41
 		}
42 42
 
43 43
 		return self::$revisions;
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param int $id The post ID to get the revisions for
54 54
 	 * @param obj $revisions The revisions for this post
55 55
 	 */
56
-	protected static function set_revisions( $id, $revisions ) {
56
+	protected static function set_revisions($id, $revisions) {
57 57
 
58
-		array_walk( $revisions, function ( $post, $i ) {
58
+		array_walk($revisions, function($post, $i) {
59 59
 			self::$revisions[] = array(
60 60
 				'post_content' => $post->post_content,
61 61
 				'post_title' => $post->post_title,
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 	 *
74 74
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
75 75
 	 */
76
-	public static function params(){
77
-		$params[ 'process_revision_get' ] = array(
76
+	public static function params() {
77
+		$params['process_revision_get'] = array(
78 78
 			'postid'    => 'absint',
79 79
 			'limit'     => 'absint'
80 80
 		);
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 * @return array Array of additional functions to use to authorize action.
91 91
 	 */
92 92
 	public static function auth_callbacks() {
93
-		$params[ 'process_revision_get' ] = array(
93
+		$params['process_revision_get'] = array(
94 94
 			'lasso_user_can'
95 95
 		);
96 96
 
Please login to merge, or discard this patch.
includes/process/title_update.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,19 +28,19 @@  discard block
 block discarded – undo
28 28
 	 *
29 29
 	 * @return bool Always returns true.
30 30
 	 */
31
-	public function post( $data ) {
31
+	public function post($data) {
32 32
 
33
-		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
34
-		$title  = isset( $data['title'] ) ? $data['title'] : false;
33
+		$postid = isset($data['postid']) ? $data['postid'] : false;
34
+		$title  = isset($data['title']) ? $data['title'] : false;
35 35
 
36 36
 		$args = array(
37 37
 			'ID'   => (int) $postid,
38
-			'post_title'    => wp_strip_all_tags( $title )
38
+			'post_title'    => wp_strip_all_tags($title)
39 39
 		);
40 40
 
41
-		wp_update_post( apply_filters( 'lasso_title_updated_args', $args ) );
41
+		wp_update_post(apply_filters('lasso_title_updated_args', $args));
42 42
 
43
-		do_action( 'lasso_title_updated', $postid, $title, get_current_user_ID() );
43
+		do_action('lasso_title_updated', $postid, $title, get_current_user_ID());
44 44
 
45 45
 		return true;
46 46
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	 *
54 54
 	 * @return array Array of keys to pull from $data per action and their sanitization callback
55 55
 	 */
56
-	public static function params(){
57
-		$params[ 'process_title_update_post' ] = array(
56
+	public static function params() {
57
+		$params['process_title_update_post'] = array(
58 58
 			'postid' => 'absint',
59 59
 			'title' => 'strip_tags'
60 60
 		);
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * @return array Array of additional functions to use to authorize action.
72 72
 	 */
73 73
 	public static function auth_callbacks() {
74
-		$params[ 'process_title_update_post' ] = array(
74
+		$params['process_title_update_post'] = array(
75 75
 			'lasso_user_can'
76 76
 		);
77 77
 
Please login to merge, or discard this patch.