Media from FTP - Version 11.04

Version Description

Fixed problem of help tab.

Download this release

Release Info

Developer Katsushi Kawamori
Plugin Icon wp plugin Media from FTP
Version 11.04
Comparing to
See all releases

Code changes from version 11.03 to 11.04

Files changed (4) hide show
  1. mediafromftp.php +1 -1
  2. readme.txt +4 -1
  3. req/class-mediafromftpadmin.php +15 -16
  4. req/class-mediafromftpregist.php +1 -1
mediafromftp.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Media from FTP
4
  * Plugin URI: https://wordpress.org/plugins/media-from-ftp/
5
  * Description: Register to media library from files that have been uploaded by FTP.
6
- * Version: 11.03
7
  * Author: Katsushi Kawamori
8
  * Author URI: https://riverforest-wp.info/
9
  * License: GPL2
3
  * Plugin Name: Media from FTP
4
  * Plugin URI: https://wordpress.org/plugins/media-from-ftp/
5
  * Description: Register to media library from files that have been uploaded by FTP.
6
+ * Version: 11.04
7
  * Author: Katsushi Kawamori
8
  * Author URI: https://riverforest-wp.info/
9
  * License: GPL2
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: files, ftp, import, media, sync, uploads
5
  Requires at least: 3.6.0
6
  Requires PHP: 5.6
7
  Tested up to: 5.3
8
- Stable tag: 11.03
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -131,6 +131,9 @@ Password: live789user
131
 
132
  == Changelog ==
133
 
 
 
 
134
  = 11.03 =
135
  Fixed an issue where the original image was searched when media reduced with a large image was registered.
136
 
5
  Requires at least: 3.6.0
6
  Requires PHP: 5.6
7
  Tested up to: 5.3
8
+ Stable tag: 11.04
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
131
 
132
  == Changelog ==
133
 
134
+ = 11.04 =
135
+ Fixed problem of help tab.
136
+
137
  = 11.03 =
138
  Fixed an issue where the original image was searched when media reduced with a large image was registered.
139
 
req/class-mediafromftpadmin.php CHANGED
@@ -151,7 +151,7 @@ class MediaFromFtpAdmin {
151
  add_action( 'admin_footer', array( $this, 'load_custom_wp_admin_style2' ) );
152
  add_action( 'screen_settings', array( $this, 'search_register_show_screen_options' ), 10, 2 );
153
  add_filter( 'set-screen-option', array( $this, 'search_register_set_screen_options' ), 11, 3 );
154
- add_filter( 'contextual_help', array( $this, 'search_register_help_tab' ), 12, 3 );
155
  add_filter( 'robots_txt', array( $this, 'custom_robots_txt' ), 9999 );
156
 
157
  }
@@ -293,14 +293,16 @@ class MediaFromFtpAdmin {
293
  /** ==================================================
294
  * Help Tab
295
  *
296
- * @param string $help help.
297
- * @param string $screen_id screen_id.
298
- * @param object $screen screen.
299
  * @since 9.53
300
  */
301
- public function search_register_help_tab( $help, $screen_id, $screen ) {
302
 
 
 
303
  if ( 'media-from-ftp_page_mediafromftp-search-register' === $screen_id || 'media-from-ftp_page_mediafromftp-settings' === $screen_id || 'media-from-ftp_page_mediafromftp-event' === $screen_id || 'media-from-ftp_page_mediafromftp-log' === $screen_id || 'media-from-ftp_page_mediafromftp-import' === $screen_id || 'media-from-ftp_page_mediafromftp-addons' === $screen_id ) {
 
 
 
304
  $sidebar = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
305
  $sidebar .= '<p><a href="' . __( 'https://wordpress.org/plugins/media-from-ftp/faq', 'media-from-ftp' ) . '" target="_blank">' . __( 'FAQ' ) . '</a></p>';
306
  $sidebar .= '<p><a href="https://wordpress.org/support/plugin/media-from-ftp" target="_blank">' . __( 'Support Forums' ) . '</a></p>';
@@ -310,12 +312,10 @@ class MediaFromFtpAdmin {
310
  $sidebar .= '<p><a style="text-decoration: none;" href="https://www.facebook.com/katsushikawamori/" target="_blank"><span class="dashicons dashicons-facebook"></span></a> <a style="text-decoration: none;" href="https://twitter.com/dodesyo312" target="_blank"><span class="dashicons dashicons-twitter"></span></a> <a style="text-decoration: none;" href="https://www.youtube.com/channel/UC5zTLeyROkvZm86OgNRcb_w" target="_blank"><span class="dashicons dashicons-video-alt3"></span></a></p>';
311
  $sidebar .= '<p><a href="' . __( 'https://riverforest-wp.info/donate/', 'media-from-ftp' ) . '" target="_blank">' . __( 'Donate to this plugin &#187;' ) . '</a></p>';
312
 
313
- $tabs = $this->get_help_message( $screen_id );
314
- foreach ( $tabs as $tab ) {
315
- $screen->add_help_tab( $tab );
316
- }
317
- $screen->set_help_sidebar( $sidebar );
318
  }
 
319
  }
320
 
321
  /** ==================================================
@@ -370,14 +370,13 @@ class MediaFromFtpAdmin {
370
  }
371
 
372
  $tabs = array(
373
- array(
374
- 'title' => __( 'Overview' ),
375
- 'id' => 'outline',
376
- 'content' => $outline,
377
- ),
378
  );
379
 
380
  return $tabs;
 
381
  }
382
 
383
  /** ==================================================
@@ -1994,7 +1993,7 @@ class MediaFromFtpAdmin {
1994
  $mediafromftp_settings['caption']['exif_text'] = wp_strip_all_tags( wp_unslash( $_POST['mediafromftp_exif_text'] ) );
1995
  }
1996
  if ( ! empty( $_POST['mediafromftp_exif_default'] ) ) {
1997
- $mediafromftp_settings['caption']['exif_text'] = '%title% %credit% %camera% %caption% %created_timestamp% %copyright% %aperture% %shutter_speed% %iso% %focal_length% %white_balance%';
1998
  }
1999
  if ( ! empty( $_POST['mediafromftp_apply_log'] ) ) {
2000
  $mediafromftp_settings['log'] = 1;
151
  add_action( 'admin_footer', array( $this, 'load_custom_wp_admin_style2' ) );
152
  add_action( 'screen_settings', array( $this, 'search_register_show_screen_options' ), 10, 2 );
153
  add_filter( 'set-screen-option', array( $this, 'search_register_set_screen_options' ), 11, 3 );
154
+ add_filter( 'admin_head', array( $this, 'search_register_help_tab' ) );
155
  add_filter( 'robots_txt', array( $this, 'custom_robots_txt' ), 9999 );
156
 
157
  }
293
  /** ==================================================
294
  * Help Tab
295
  *
 
 
 
296
  * @since 9.53
297
  */
298
+ public function search_register_help_tab() {
299
 
300
+ $current_screen = get_current_screen();
301
+ $screen_id = $current_screen->id;
302
  if ( 'media-from-ftp_page_mediafromftp-search-register' === $screen_id || 'media-from-ftp_page_mediafromftp-settings' === $screen_id || 'media-from-ftp_page_mediafromftp-event' === $screen_id || 'media-from-ftp_page_mediafromftp-log' === $screen_id || 'media-from-ftp_page_mediafromftp-import' === $screen_id || 'media-from-ftp_page_mediafromftp-addons' === $screen_id ) {
303
+
304
+ $current_screen->add_help_tab( $this->get_help_message( $screen_id ) );
305
+
306
  $sidebar = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
307
  $sidebar .= '<p><a href="' . __( 'https://wordpress.org/plugins/media-from-ftp/faq', 'media-from-ftp' ) . '" target="_blank">' . __( 'FAQ' ) . '</a></p>';
308
  $sidebar .= '<p><a href="https://wordpress.org/support/plugin/media-from-ftp" target="_blank">' . __( 'Support Forums' ) . '</a></p>';
312
  $sidebar .= '<p><a style="text-decoration: none;" href="https://www.facebook.com/katsushikawamori/" target="_blank"><span class="dashicons dashicons-facebook"></span></a> <a style="text-decoration: none;" href="https://twitter.com/dodesyo312" target="_blank"><span class="dashicons dashicons-twitter"></span></a> <a style="text-decoration: none;" href="https://www.youtube.com/channel/UC5zTLeyROkvZm86OgNRcb_w" target="_blank"><span class="dashicons dashicons-video-alt3"></span></a></p>';
313
  $sidebar .= '<p><a href="' . __( 'https://riverforest-wp.info/donate/', 'media-from-ftp' ) . '" target="_blank">' . __( 'Donate to this plugin &#187;' ) . '</a></p>';
314
 
315
+ $current_screen->set_help_sidebar( $sidebar );
316
+
 
 
 
317
  }
318
+
319
  }
320
 
321
  /** ==================================================
370
  }
371
 
372
  $tabs = array(
373
+ 'id' => $screen_id,
374
+ 'title' => __( 'Overview' ),
375
+ 'content' => $outline,
 
 
376
  );
377
 
378
  return $tabs;
379
+
380
  }
381
 
382
  /** ==================================================
1993
  $mediafromftp_settings['caption']['exif_text'] = wp_strip_all_tags( wp_unslash( $_POST['mediafromftp_exif_text'] ) );
1994
  }
1995
  if ( ! empty( $_POST['mediafromftp_exif_default'] ) ) {
1996
+ $mediafromftp_settings['caption']['exif_text'] = '%title% %credit% %camera% %caption% %created_timestamp% %copyright% %aperture% %shutter_speed% %iso% %focal_length% %white_balance% %orientation%';
1997
  }
1998
  if ( ! empty( $_POST['mediafromftp_apply_log'] ) ) {
1999
  $mediafromftp_settings['log'] = 1;
req/class-mediafromftpregist.php CHANGED
@@ -225,7 +225,7 @@ class MediaFromFtpRegist {
225
  $cron_mail_apply = true;
226
 
227
  $caption_apply = false;
228
- $exif_text = '%title% %credit% %camera% %caption% %created_timestamp% %copyright% %aperture% %shutter_speed% %iso% %focal_length% %white_balance%';
229
  $log = false;
230
 
231
  /* for media-from-ftp-add-on-category */
225
  $cron_mail_apply = true;
226
 
227
  $caption_apply = false;
228
+ $exif_text = '%title% %credit% %camera% %caption% %created_timestamp% %copyright% %aperture% %shutter_speed% %iso% %focal_length% %white_balance% %orientation%';
229
  $log = false;
230
 
231
  /* for media-from-ftp-add-on-category */