@@ -26,16 +26,16 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -270,11 +270,13 @@ |
||
| 270 | 270 | |
| 271 | 271 | $data = array_merge( $this->api_data, $_data ); |
| 272 | 272 | |
| 273 | - if ( $data['slug'] != $this->slug ) |
|
| 274 | - return; |
|
| 273 | + if ( $data['slug'] != $this->slug ) { |
|
| 274 | + return; |
|
| 275 | + } |
|
| 275 | 276 | |
| 276 | - if ( empty( $data['license'] ) ) |
|
| 277 | - return; |
|
| 277 | + if ( empty( $data['license'] ) ) { |
|
| 278 | + return; |
|
| 279 | + } |
|
| 278 | 280 | |
| 279 | 281 | if ( $this->api_url == home_url() ) { |
| 280 | 282 | return false; // Don't allow a plugin to ping itself |
@@ -106,8 +106,10 @@ discard block |
||
| 106 | 106 | if ( isset( $_POST['edd_license_activate'] ) ) { |
| 107 | 107 | |
| 108 | 108 | // run a quick security check |
| 109 | - if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) |
|
| 110 | - return; // get out if we didn't click the Activate button |
|
| 109 | + if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) { |
|
| 110 | + return; |
|
| 111 | + } |
|
| 112 | + // get out if we didn't click the Activate button |
|
| 111 | 113 | |
| 112 | 114 | // retrieve the license from the database |
| 113 | 115 | $license = trim( get_option( 'lasso_license_key' ) ); |
@@ -124,8 +126,9 @@ discard block |
||
| 124 | 126 | $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
| 125 | 127 | |
| 126 | 128 | // make sure the response came back okay |
| 127 | - if ( is_wp_error( $response ) ) |
|
| 128 | - return false; |
|
| 129 | + if ( is_wp_error( $response ) ) { |
|
| 130 | + return false; |
|
| 131 | + } |
|
| 129 | 132 | |
| 130 | 133 | // decode the license data |
| 131 | 134 | $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
@@ -143,8 +146,10 @@ discard block |
||
| 143 | 146 | if ( isset( $_POST['edd_license_deactivate'] ) ) { |
| 144 | 147 | |
| 145 | 148 | // run a quick security check |
| 146 | - if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) |
|
| 147 | - return; // get out if we didn't click the Activate button |
|
| 149 | + if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) { |
|
| 150 | + return; |
|
| 151 | + } |
|
| 152 | + // get out if we didn't click the Activate button |
|
| 148 | 153 | |
| 149 | 154 | // retrieve the license from the database |
| 150 | 155 | $license = trim( get_option( 'lasso_license_key' ) ); |
@@ -162,15 +167,17 @@ discard block |
||
| 162 | 167 | $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
| 163 | 168 | |
| 164 | 169 | // make sure the response came back okay |
| 165 | - if ( is_wp_error( $response ) ) |
|
| 166 | - return false; |
|
| 170 | + if ( is_wp_error( $response ) ) { |
|
| 171 | + return false; |
|
| 172 | + } |
|
| 167 | 173 | |
| 168 | 174 | // decode the license data |
| 169 | 175 | $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
| 170 | 176 | |
| 171 | 177 | // $license_data->license will be either "deactivated" or "failed" |
| 172 | - if ( $license_data->license == 'deactivated' ) |
|
| 173 | - delete_option( 'lasso_license_status' ); |
|
| 178 | + if ( $license_data->license == 'deactivated' ) { |
|
| 179 | + delete_option( 'lasso_license_status' ); |
|
| 180 | + } |
|
| 174 | 181 | |
| 175 | 182 | } |
| 176 | 183 | } |
@@ -192,8 +199,9 @@ discard block |
||
| 192 | 199 | // Call the custom API. |
| 193 | 200 | $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
| 194 | 201 | |
| 195 | - if ( is_wp_error( $response ) ) |
|
| 196 | - return false; |
|
| 202 | + if ( is_wp_error( $response ) ) { |
|
| 203 | + return false; |
|
| 204 | + } |
|
| 197 | 205 | |
| 198 | 206 | $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
| 199 | 207 | |
@@ -6,28 +6,28 @@ discard block |
||
| 6 | 6 | |
| 7 | 7 | function __construct() { |
| 8 | 8 | |
| 9 | - define( 'LASSO_STORE_ITEM_NAME', 'lasso' ); |
|
| 10 | - define( 'LASSO_STORE_URL', 'https://edituswp.com' ); |
|
| 11 | - |
|
| 12 | - add_action( 'admin_init', array( $this, 'plugin_updater' ), 0 ); |
|
| 13 | - add_action( 'admin_menu', array( $this, 'license_menu' ) ); |
|
| 14 | - add_action( 'network_admin_menu', array( $this, 'license_menu' ) ); // CHANGED Added hook. |
|
| 15 | - add_action( 'admin_init', array( $this, 'register_option' ) ); |
|
| 16 | - add_action( 'admin_init', array( $this, 'activate_license' ) ); |
|
| 17 | - add_action( 'admin_init', array( $this, 'deactivate_license' ) ); |
|
| 9 | + define('LASSO_STORE_ITEM_NAME', 'lasso'); |
|
| 10 | + define('LASSO_STORE_URL', 'https://edituswp.com'); |
|
| 11 | + |
|
| 12 | + add_action('admin_init', array($this, 'plugin_updater'), 0); |
|
| 13 | + add_action('admin_menu', array($this, 'license_menu')); |
|
| 14 | + add_action('network_admin_menu', array($this, 'license_menu')); // CHANGED Added hook. |
|
| 15 | + add_action('admin_init', array($this, 'register_option')); |
|
| 16 | + add_action('admin_init', array($this, 'activate_license')); |
|
| 17 | + add_action('admin_init', array($this, 'deactivate_license')); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | function plugin_updater() { |
| 21 | 21 | |
| 22 | 22 | // retrieve our license key from the DB |
| 23 | - $license_key = trim( get_option( 'lasso_license_key' ) ); |
|
| 23 | + $license_key = trim(get_option('lasso_license_key')); |
|
| 24 | 24 | |
| 25 | 25 | // setup the updater |
| 26 | - $edd_updater = new \EDD_SL_Plugin_Updater( LASSO_STORE_URL , LASSO_FILE, array( |
|
| 26 | + $edd_updater = new \EDD_SL_Plugin_Updater(LASSO_STORE_URL, LASSO_FILE, array( |
|
| 27 | 27 | 'version' => LASSO_VERSION, |
| 28 | 28 | 'license' => $license_key, |
| 29 | 29 | 'item_name' => LASSO_STORE_ITEM_NAME, |
| 30 | - 'author' => __( 'Aesopinteractive LLC', 'lasso' ) |
|
| 30 | + 'author' => __('Aesopinteractive LLC', 'lasso') |
|
| 31 | 31 | ) |
| 32 | 32 | ); |
| 33 | 33 | |
@@ -35,51 +35,51 @@ discard block |
||
| 35 | 35 | function license_menu() { |
| 36 | 36 | |
| 37 | 37 | // CHANGED Removed condition. |
| 38 | - add_submenu_page( 'lasso-editor', __( 'License Key', 'lasso' ), __( 'License', 'lasso' ), 'manage_options', 'lasso-license', array( $this, 'license_page' ) ); |
|
| 38 | + add_submenu_page('lasso-editor', __('License Key', 'lasso'), __('License', 'lasso'), 'manage_options', 'lasso-license', array($this, 'license_page')); |
|
| 39 | 39 | |
| 40 | 40 | } |
| 41 | 41 | function license_page() { |
| 42 | - $license = get_option( 'lasso_license_key' ); |
|
| 43 | - $status = get_option( 'lasso_license_status' ); |
|
| 42 | + $license = get_option('lasso_license_key'); |
|
| 43 | + $status = get_option('lasso_license_status'); |
|
| 44 | 44 | |
| 45 | 45 | ?> |
| 46 | 46 | <div class="wrap"> |
| 47 | - <h2><?php _e( 'Editus License', 'lasso' ); ?></h2> |
|
| 48 | - <p><?php _e( 'Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso' );?></p> |
|
| 47 | + <h2><?php _e('Editus License', 'lasso'); ?></h2> |
|
| 48 | + <p><?php _e('Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso'); ?></p> |
|
| 49 | 49 | <form class="lasso--form-settings" method="post" action="options.php"> |
| 50 | 50 | |
| 51 | - <?php settings_fields( 'lasso_license' ); ?> |
|
| 51 | + <?php settings_fields('lasso_license'); ?> |
|
| 52 | 52 | |
| 53 | 53 | <table class="form-table"> |
| 54 | 54 | <tbody> |
| 55 | 55 | <tr valign="top"> |
| 56 | 56 | <th scope="row" valign="top"> |
| 57 | - <?php _e( 'License Key', 'lasso' ); ?> |
|
| 57 | + <?php _e('License Key', 'lasso'); ?> |
|
| 58 | 58 | </th> |
| 59 | 59 | <td> |
| 60 | - <input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e( $license ); ?>" /> |
|
| 60 | + <input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e($license); ?>" /> |
|
| 61 | 61 | </td> |
| 62 | 62 | </tr> |
| 63 | - <?php if ( false !== $license ) { ?> |
|
| 63 | + <?php if (false !== $license) { ?> |
|
| 64 | 64 | <tr valign="top"> |
| 65 | 65 | <th scope="row" valign="top"> |
| 66 | - <?php _e( 'Activate License', 'lasso' ); ?> |
|
| 66 | + <?php _e('Activate License', 'lasso'); ?> |
|
| 67 | 67 | </th> |
| 68 | 68 | <td> |
| 69 | - <?php if ( $status !== false && $status == 'valid' ) { ?> |
|
| 70 | - <span style="color:green;"><?php _e( 'active' ); ?></span> |
|
| 71 | - <?php wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?> |
|
| 72 | - <input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e( 'Deactivate License', 'lasso' ); ?>"/> |
|
| 69 | + <?php if ($status !== false && $status == 'valid') { ?> |
|
| 70 | + <span style="color:green;"><?php _e('active'); ?></span> |
|
| 71 | + <?php wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?> |
|
| 72 | + <input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e('Deactivate License', 'lasso'); ?>"/> |
|
| 73 | 73 | <?php } else { |
| 74 | - wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?> |
|
| 75 | - <input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e( 'Activate License', 'lasso' ); ?>"/> |
|
| 74 | + wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?> |
|
| 75 | + <input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e('Activate License', 'lasso'); ?>"/> |
|
| 76 | 76 | <?php } ?> |
| 77 | 77 | </td> |
| 78 | 78 | </tr> |
| 79 | 79 | <?php } ?> |
| 80 | 80 | </tbody> |
| 81 | 81 | </table> |
| 82 | - <?php submit_button( 'Save License' ); ?> |
|
| 82 | + <?php submit_button('Save License'); ?> |
|
| 83 | 83 | |
| 84 | 84 | </form> |
| 85 | 85 | <?php |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | // register option |
| 89 | 89 | function register_option() { |
| 90 | 90 | |
| 91 | - register_setting( 'lasso_license', 'lasso_license_key', array( $this, 'sanitize_license' ) ); |
|
| 91 | + register_setting('lasso_license', 'lasso_license_key', array($this, 'sanitize_license')); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // santize |
| 95 | - function sanitize_license( $new ) { |
|
| 96 | - $old = get_option( 'lasso_license_key' ); |
|
| 97 | - if ( $old && $old != $new ) { |
|
| 98 | - delete_option( 'lasso_license_status' ); // new license has been entered, so must reactivate |
|
| 95 | + function sanitize_license($new) { |
|
| 96 | + $old = get_option('lasso_license_key'); |
|
| 97 | + if ($old && $old != $new) { |
|
| 98 | + delete_option('lasso_license_status'); // new license has been entered, so must reactivate |
|
| 99 | 99 | } |
| 100 | 100 | return $new; |
| 101 | 101 | } |
@@ -104,36 +104,36 @@ discard block |
||
| 104 | 104 | function activate_license() { |
| 105 | 105 | |
| 106 | 106 | // listen for our activate button to be clicked |
| 107 | - if ( isset( $_POST['edd_license_activate'] ) ) { |
|
| 107 | + if (isset($_POST['edd_license_activate'])) { |
|
| 108 | 108 | |
| 109 | 109 | // run a quick security check |
| 110 | - if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) |
|
| 110 | + if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce')) |
|
| 111 | 111 | return; // get out if we didn't click the Activate button |
| 112 | 112 | |
| 113 | 113 | // retrieve the license from the database |
| 114 | - $license = trim( get_option( 'lasso_license_key' ) ); |
|
| 114 | + $license = trim(get_option('lasso_license_key')); |
|
| 115 | 115 | |
| 116 | 116 | // data to send in our API request |
| 117 | 117 | $api_params = array( |
| 118 | 118 | 'edd_action'=> 'activate_license', |
| 119 | 119 | 'license' => $license, |
| 120 | - 'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD |
|
| 120 | + 'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD |
|
| 121 | 121 | 'url' => home_url() |
| 122 | 122 | ); |
| 123 | 123 | |
| 124 | 124 | // Call the custom API. |
| 125 | - $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
|
| 125 | + $response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false)); |
|
| 126 | 126 | |
| 127 | 127 | // make sure the response came back okay |
| 128 | - if ( is_wp_error( $response ) ) |
|
| 128 | + if (is_wp_error($response)) |
|
| 129 | 129 | return false; |
| 130 | 130 | |
| 131 | 131 | // decode the license data |
| 132 | - $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
|
| 132 | + $license_data = json_decode(wp_remote_retrieve_body($response)); |
|
| 133 | 133 | |
| 134 | 134 | // $license_data->license will be either "valid" or "invalid" |
| 135 | 135 | |
| 136 | - update_option( 'lasso_license_status', $license_data->license ); |
|
| 136 | + update_option('lasso_license_status', $license_data->license); |
|
| 137 | 137 | |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -141,37 +141,37 @@ discard block |
||
| 141 | 141 | function deactivate_license() { |
| 142 | 142 | |
| 143 | 143 | // listen for our activate button to be clicked |
| 144 | - if ( isset( $_POST['edd_license_deactivate'] ) ) { |
|
| 144 | + if (isset($_POST['edd_license_deactivate'])) { |
|
| 145 | 145 | |
| 146 | 146 | // run a quick security check |
| 147 | - if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) |
|
| 147 | + if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce')) |
|
| 148 | 148 | return; // get out if we didn't click the Activate button |
| 149 | 149 | |
| 150 | 150 | // retrieve the license from the database |
| 151 | - $license = trim( get_option( 'lasso_license_key' ) ); |
|
| 151 | + $license = trim(get_option('lasso_license_key')); |
|
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | // data to send in our API request |
| 155 | 155 | $api_params = array( |
| 156 | 156 | 'edd_action'=> 'deactivate_license', |
| 157 | 157 | 'license' => $license, |
| 158 | - 'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD |
|
| 158 | + 'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD |
|
| 159 | 159 | 'url' => home_url() |
| 160 | 160 | ); |
| 161 | 161 | |
| 162 | 162 | // Call the custom API. |
| 163 | - $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
|
| 163 | + $response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false)); |
|
| 164 | 164 | |
| 165 | 165 | // make sure the response came back okay |
| 166 | - if ( is_wp_error( $response ) ) |
|
| 166 | + if (is_wp_error($response)) |
|
| 167 | 167 | return false; |
| 168 | 168 | |
| 169 | 169 | // decode the license data |
| 170 | - $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
|
| 170 | + $license_data = json_decode(wp_remote_retrieve_body($response)); |
|
| 171 | 171 | |
| 172 | 172 | // $license_data->license will be either "deactivated" or "failed" |
| 173 | - if ( $license_data->license == 'deactivated' ) |
|
| 174 | - delete_option( 'lasso_license_status' ); |
|
| 173 | + if ($license_data->license == 'deactivated') |
|
| 174 | + delete_option('lasso_license_status'); |
|
| 175 | 175 | |
| 176 | 176 | } |
| 177 | 177 | } |
@@ -181,24 +181,24 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | global $wp_version; |
| 183 | 183 | |
| 184 | - $license = trim( get_option( 'lasso_license_key' ) ); |
|
| 184 | + $license = trim(get_option('lasso_license_key')); |
|
| 185 | 185 | |
| 186 | 186 | $api_params = array( |
| 187 | 187 | 'edd_action' => 'check_license', |
| 188 | 188 | 'license' => $license, |
| 189 | - 'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), |
|
| 189 | + 'item_name' => urlencode(LASSO_STORE_ITEM_NAME), |
|
| 190 | 190 | 'url' => home_url() |
| 191 | 191 | ); |
| 192 | 192 | |
| 193 | 193 | // Call the custom API. |
| 194 | - $response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) ); |
|
| 194 | + $response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false)); |
|
| 195 | 195 | |
| 196 | - if ( is_wp_error( $response ) ) |
|
| 196 | + if (is_wp_error($response)) |
|
| 197 | 197 | return false; |
| 198 | 198 | |
| 199 | - $license_data = json_decode( wp_remote_retrieve_body( $response ) ); |
|
| 199 | + $license_data = json_decode(wp_remote_retrieve_body($response)); |
|
| 200 | 200 | |
| 201 | - if ( $license_data->license == 'valid' ) { |
|
| 201 | + if ($license_data->license == 'valid') { |
|
| 202 | 202 | echo 'valid'; exit; |
| 203 | 203 | // this license is still valid |
| 204 | 204 | } else { |
@@ -9,7 +9,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -115,8 +115,8 @@ |
||
| 115 | 115 | // replace namespace separators with directory separators |
| 116 | 116 | // in the relative class name, append with .php |
| 117 | 117 | $file = $base_dir |
| 118 | - . str_replace('\\', '/', $relative_class) |
|
| 119 | - . '.php'; |
|
| 118 | + . str_replace('\\', '/', $relative_class) |
|
| 119 | + . '.php'; |
|
| 120 | 120 | |
| 121 | 121 | // if the mapped file exists, require it |
| 122 | 122 | if ($this->requireFile($file)) { |
@@ -40,10 +40,10 @@ |
||
| 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) { |
@@ -25,12 +25,12 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -30,8 +30,9 @@ |
||
| 30 | 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 ) ) |
|
| 34 | - return; |
|
| 33 | + if ( !lasso_user_can( 'delete_post', $postid ) ) { |
|
| 34 | + return; |
|
| 35 | + } |
|
| 35 | 36 | |
| 36 | 37 | $args = array( |
| 37 | 38 | 'ID' => (int) $postid, |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | $gallery_ids = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false; |
| 120 | 120 | if ( ! empty( $data ) && $data[ 'gallery_type' ] ) { |
| 121 | 121 | $type = $data[ 'gallery_type' ]; |
| 122 | - }elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) { |
|
| 122 | + } elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) { |
|
| 123 | 123 | $type = $options[ 'galleryType' ]; |
| 124 | - }else{ |
|
| 124 | + } else{ |
|
| 125 | 125 | $type = false; |
| 126 | 126 | } |
| 127 | 127 | |
@@ -173,8 +173,9 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | private function get_the_images( $image_ids = '' ) { |
| 175 | 175 | |
| 176 | - if ( empty( $image_ids ) ) |
|
| 177 | - return; |
|
| 176 | + if ( empty( $image_ids ) ) { |
|
| 177 | + return; |
|
| 178 | + } |
|
| 178 | 179 | |
| 179 | 180 | $image_ids = array_map( 'intval', explode( ',', $image_ids ) ); |
| 180 | 181 | |
@@ -29,15 +29,15 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @return array Key "markup" has the HTML. |
| 31 | 31 | */ |
| 32 | - public function swap( $data ) { |
|
| 32 | + public function swap($data) { |
|
| 33 | 33 | |
| 34 | 34 | |
| 35 | - $id = $data[ 'gallery_id' ]; |
|
| 36 | - if ( is_null( $id ) ) { |
|
| 35 | + $id = $data['gallery_id']; |
|
| 36 | + if (is_null($id)) { |
|
| 37 | 37 | $id = false; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - $markup = sprintf( '<div contenteditable="false" class="lasso--empty-component aesop-component aesop-gallery-component" data-component-type="gallery" data-id="%s">%s</div>', $id, __( 'Save and refresh to view gallery.','lasso' ) ); |
|
| 40 | + $markup = sprintf('<div contenteditable="false" class="lasso--empty-component aesop-component aesop-gallery-component" data-component-type="gallery" data-id="%s">%s</div>', $id, __('Save and refresh to view gallery.', 'lasso')); |
|
| 41 | 41 | |
| 42 | 42 | return array( |
| 43 | 43 | 'gallery' => $markup |
@@ -54,49 +54,49 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @return array|bool On success an array containing "message" or on failure false. |
| 56 | 56 | */ |
| 57 | - public function create( $data ) { |
|
| 57 | + public function create($data) { |
|
| 58 | 58 | |
| 59 | 59 | //@todo adapt auth callbacks to work with args. |
| 60 | - if ( ! lasso_user_can( 'publish_posts' ) ) { |
|
| 60 | + if (!lasso_user_can('publish_posts')) { |
|
| 61 | 61 | return false; |
| 62 | 62 | |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - $gallery_ids = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false; |
|
| 65 | + $gallery_ids = isset($data['gallery_ids']) ? $data['gallery_ids'] : false; |
|
| 66 | 66 | |
| 67 | 67 | // bail if no gallery ids |
| 68 | - if ( empty( $gallery_ids ) ) { |
|
| 68 | + if (empty($gallery_ids)) { |
|
| 69 | 69 | return false; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $postid = isset( $data['postid'] ) ? (int) $data['postid'] : false; |
|
| 73 | - $type = isset( $data['gallery_type'] ) ? $data['gallery_type'] : false; |
|
| 74 | - $edgallerytitle = isset( $data['edgallerytitle'] ) ? $data['edgallerytitle'] : $postid.'-'.rand(); |
|
| 72 | + $postid = isset($data['postid']) ? (int) $data['postid'] : false; |
|
| 73 | + $type = isset($data['gallery_type']) ? $data['gallery_type'] : false; |
|
| 74 | + $edgallerytitle = isset($data['edgallerytitle']) ? $data['edgallerytitle'] : $postid.'-'.rand(); |
|
| 75 | 75 | |
| 76 | 76 | // insert a new gallery |
| 77 | 77 | $args = array( |
| 78 | - 'post_title' => $edgallerytitle , |
|
| 78 | + 'post_title' => $edgallerytitle, |
|
| 79 | 79 | 'post_status' => 'publish', |
| 80 | 80 | 'post_type' => 'ai_galleries' |
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | - $postid = wp_insert_post( apply_filters( 'lasso_insert_gallery_args', $args ) ); |
|
| 83 | + $postid = wp_insert_post(apply_filters('lasso_insert_gallery_args', $args)); |
|
| 84 | 84 | |
| 85 | 85 | // update gallery ids |
| 86 | - if ( $gallery_ids ) { |
|
| 86 | + if ($gallery_ids) { |
|
| 87 | 87 | |
| 88 | - update_post_meta( $postid, '_ase_gallery_images', $gallery_ids ); |
|
| 88 | + update_post_meta($postid, '_ase_gallery_images', $gallery_ids); |
|
| 89 | 89 | |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | // update the gallery type |
| 93 | - if ( !empty( $type ) ) { |
|
| 93 | + if (!empty($type)) { |
|
| 94 | 94 | |
| 95 | - update_post_meta( $postid, 'aesop_gallery_type', $type ); |
|
| 95 | + update_post_meta($postid, 'aesop_gallery_type', $type); |
|
| 96 | 96 | |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - do_action( 'lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID() ); |
|
| 99 | + do_action('lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID()); |
|
| 100 | 100 | |
| 101 | 101 | return array( |
| 102 | 102 | 'message' => 'gallery-created', |
@@ -114,20 +114,20 @@ discard block |
||
| 114 | 114 | * |
| 115 | 115 | * @return array "message" key has the message. |
| 116 | 116 | */ |
| 117 | - public function update( $data ) { |
|
| 118 | - |
|
| 119 | - $options = isset( $data['fields'] ) ? $data['fields'] : false; |
|
| 120 | - $postid = !empty( $options ) ? (int) $options['id'] : false; |
|
| 121 | - $gallery_ids = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false; |
|
| 122 | - if ( ! empty( $data ) && $data[ 'gallery_type' ] ) { |
|
| 123 | - $type = $data[ 'gallery_type' ]; |
|
| 124 | - }elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) { |
|
| 125 | - $type = $options[ 'galleryType' ]; |
|
| 126 | - }else{ |
|
| 117 | + public function update($data) { |
|
| 118 | + |
|
| 119 | + $options = isset($data['fields']) ? $data['fields'] : false; |
|
| 120 | + $postid = !empty($options) ? (int) $options['id'] : false; |
|
| 121 | + $gallery_ids = isset($data['gallery_ids']) ? $data['gallery_ids'] : false; |
|
| 122 | + if (!empty($data) && $data['gallery_type']) { |
|
| 123 | + $type = $data['gallery_type']; |
|
| 124 | + }elseif (!empty($options) && $options['galleryType']) { |
|
| 125 | + $type = $options['galleryType']; |
|
| 126 | + } else { |
|
| 127 | 127 | $type = false; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - save_gallery::save_gallery_options( $postid, $gallery_ids, $options, $type ); |
|
| 130 | + save_gallery::save_gallery_options($postid, $gallery_ids, $options, $type); |
|
| 131 | 131 | |
| 132 | 132 | return array( |
| 133 | 133 | 'message' => 'gallery-updated' |
@@ -145,25 +145,25 @@ discard block |
||
| 145 | 145 | * |
| 146 | 146 | * @return bool |
| 147 | 147 | */ |
| 148 | - public function get_images( $data ) { |
|
| 148 | + public function get_images($data) { |
|
| 149 | 149 | |
| 150 | 150 | //check caps |
| 151 | - if ( !current_user_can( 'edit_posts' ) ) { |
|
| 151 | + if (!current_user_can('edit_posts')) { |
|
| 152 | 152 | return false; |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | // bail if no id specified like on new galleries |
| 156 | - if ( is_null( $data['post_id'] ) || empty( $data['post_id'] ) ) { |
|
| 156 | + if (is_null($data['post_id']) || empty($data['post_id'])) { |
|
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - $postid = isset( $data['post_id'] ) ? $data['post_id'] : false; |
|
| 160 | + $postid = isset($data['post_id']) ? $data['post_id'] : false; |
|
| 161 | 161 | |
| 162 | 162 | // fetch image ids from cache |
| 163 | - $image_ids = get_post_meta( $postid, '_ase_gallery_images', true ); |
|
| 163 | + $image_ids = get_post_meta($postid, '_ase_gallery_images', true); |
|
| 164 | 164 | |
| 165 | 165 | // send ids to return images |
| 166 | - return self::get_the_images( $image_ids ); |
|
| 166 | + return self::get_the_images($image_ids); |
|
| 167 | 167 | |
| 168 | 168 | } |
| 169 | 169 | |
@@ -173,32 +173,32 @@ discard block |
||
| 173 | 173 | * @param $image_ids array array of image ids |
| 174 | 174 | * @since 0.1 |
| 175 | 175 | */ |
| 176 | - private function get_the_images( $image_ids = '' ) { |
|
| 176 | + private function get_the_images($image_ids = '') { |
|
| 177 | 177 | |
| 178 | - if ( empty( $image_ids ) ) |
|
| 178 | + if (empty($image_ids)) |
|
| 179 | 179 | return; |
| 180 | 180 | |
| 181 | - $image_ids = array_map( 'intval', explode( ',', $image_ids ) ); |
|
| 181 | + $image_ids = array_map('intval', explode(',', $image_ids)); |
|
| 182 | 182 | |
| 183 | 183 | $out[] = '<ul id="ase-gallery-images">'; |
| 184 | 184 | |
| 185 | - if ( !empty( $image_ids ) ): |
|
| 185 | + if (!empty($image_ids)): |
|
| 186 | 186 | |
| 187 | - foreach ( $image_ids as $image_id ) { |
|
| 187 | + foreach ($image_ids as $image_id) { |
|
| 188 | 188 | |
| 189 | - $image = wp_get_attachment_image_src( $image_id, 'thumbnail', false ); |
|
| 189 | + $image = wp_get_attachment_image_src($image_id, 'thumbnail', false); |
|
| 190 | 190 | |
| 191 | - $out[] = sprintf( ' |
|
| 191 | + $out[] = sprintf(' |
|
| 192 | 192 | <li id="%1s" class="ase-gallery-image"> |
| 193 | 193 | <i class="dashicons dashicons-no-alt" title="%2s"></i> |
| 194 | 194 | <i class="dashicons dashicons-edit" title="%3s"></i> |
| 195 | 195 | <img src="%4s"> |
| 196 | 196 | </li> |
| 197 | 197 | ', |
| 198 | - absint( $image_id ), |
|
| 199 | - __( 'Delete From Gallery', 'lasso' ), |
|
| 200 | - __( 'Edit Image Caption', 'lasso' ), |
|
| 201 | - esc_url( $image[0] ) |
|
| 198 | + absint($image_id), |
|
| 199 | + __('Delete From Gallery', 'lasso'), |
|
| 200 | + __('Edit Image Caption', 'lasso'), |
|
| 201 | + esc_url($image[0]) |
|
| 202 | 202 | ); |
| 203 | 203 | |
| 204 | 204 | } |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | |
| 208 | 208 | $out[] = '</ul>'; |
| 209 | 209 | |
| 210 | - return array( 'html' => implode( '', $out ) ); |
|
| 210 | + return array('html' => implode('', $out)); |
|
| 211 | 211 | |
| 212 | 212 | } |
| 213 | 213 | |
@@ -219,13 +219,13 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * @return array Array of keys to pull from $data per action and their sanitization callback |
| 221 | 221 | */ |
| 222 | - public static function params(){ |
|
| 223 | - $params[ 'process_gallery_swap' ] = array( |
|
| 222 | + public static function params() { |
|
| 223 | + $params['process_gallery_swap'] = array( |
|
| 224 | 224 | 'gallery_id' => 'absint', |
| 225 | 225 | |
| 226 | 226 | ); |
| 227 | 227 | |
| 228 | - $params[ 'process_gallery_create' ] = array( |
|
| 228 | + $params['process_gallery_create'] = array( |
|
| 229 | 229 | 'postid' => 'absint', |
| 230 | 230 | 'content' => 'wp_kses_post', |
| 231 | 231 | 'edgallerytitle' =>'sanitize_text_field', |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | ); |
| 239 | 239 | |
| 240 | - $params[ 'process_gallery_update' ] = array( |
|
| 240 | + $params['process_gallery_update'] = array( |
|
| 241 | 241 | 'postid' => 'absint', |
| 242 | 242 | 'gallery_ids' => 'lasso_sanitize_data', |
| 243 | 243 | 'fields' => 'lasso_sanitize_data', |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | ) |
| 248 | 248 | ); |
| 249 | 249 | |
| 250 | - $params[ 'process_gallery_get_images' ] = array( |
|
| 250 | + $params['process_gallery_get_images'] = array( |
|
| 251 | 251 | 'post_id' => 'absint' |
| 252 | 252 | ); |
| 253 | 253 | |
@@ -263,19 +263,19 @@ discard block |
||
| 263 | 263 | * @return array Array of additional functions to use to authorize action. |
| 264 | 264 | */ |
| 265 | 265 | public static function auth_callbacks() { |
| 266 | - $params[ 'process_gallery_swap' ] = array( |
|
| 266 | + $params['process_gallery_swap'] = array( |
|
| 267 | 267 | 'lasso_user_can' |
| 268 | 268 | ); |
| 269 | 269 | |
| 270 | - $params[ 'process_gallery_create' ] = array( |
|
| 270 | + $params['process_gallery_create'] = array( |
|
| 271 | 271 | 'is_user_logged_in' |
| 272 | 272 | ); |
| 273 | 273 | |
| 274 | - $params[ 'process_gallery_update' ] = array( |
|
| 274 | + $params['process_gallery_update'] = array( |
|
| 275 | 275 | 'lasso_user_can' |
| 276 | 276 | ); |
| 277 | 277 | |
| 278 | - $params[ 'process_gallery_get_images' ] = array(); |
|
| 278 | + $params['process_gallery_get_images'] = array(); |
|
| 279 | 279 | |
| 280 | 280 | return $params; |
| 281 | 281 | |
@@ -27,17 +27,17 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | $args = array(); |
| 32 | 32 | if ( isset( $data[ 'limit' ] ) ) { |
| 33 | 33 | $args[ 'posts_per_page' ] = $data[ 'limit' ]; |
| 34 | - }else{ |
|
| 34 | + } else{ |
|
| 35 | 35 | $args[ 'posts_per_page' ] = 6; // we start at revision 0 |
| 36 | 36 | } |
| 37 | 37 | |
@@ -28,19 +28,19 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @returns bool Always returns true |
| 28 | 28 | */ |
| 29 | - public function hide( $data ) { |
|
| 29 | + public function hide($data) { |
|
| 30 | 30 | |
| 31 | 31 | $user_id = get_current_user_ID(); |
| 32 | 32 | |
| 33 | - update_user_meta( $user_id, 'lasso_hide_tour', true ); |
|
| 33 | + update_user_meta($user_id, 'lasso_hide_tour', true); |
|
| 34 | 34 | |
| 35 | - do_action( 'lasso_tour_hidden', $user_id ); |
|
| 35 | + do_action('lasso_tour_hidden', $user_id); |
|
| 36 | 36 | |
| 37 | 37 | return true; |
| 38 | 38 | |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @return array Array of keys to pull from $_POST per action and their sanitization callback |
| 47 | 47 | */ |
| 48 | - public static function params(){ |
|
| 49 | - $params[ 'process_tour_hide' ] = array( |
|
| 48 | + public static function params() { |
|
| 49 | + $params['process_tour_hide'] = array( |
|
| 50 | 50 | 'action' |
| 51 | 51 | ); |
| 52 | 52 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @return array Array of additional functions to use to authorize action. |
| 62 | 62 | */ |
| 63 | 63 | public static function auth_callbacks() { |
| 64 | - $params[ 'process_tour_hide' ] = array( |
|
| 64 | + $params['process_tour_hide'] = array( |
|
| 65 | 65 | 'lasso_user_can' |
| 66 | 66 | ); |
| 67 | 67 | |