Print, PDF, Email by PrintFriendly - Version 3.3.4

Version Description

  • Provided Algorithm Options
Download this release

Release Info

Developer printfriendly
Plugin Icon 128x128 Print, PDF, Email by PrintFriendly
Version 3.3.4
Comparing to
See all releases

Code changes from version 3.3.3 to 3.3.4

Files changed (3) hide show
  1. admin.css +2 -1
  2. pf.php +28 -6
  3. readme.txt +5 -2
admin.css CHANGED
@@ -352,4 +352,5 @@ span.description.pf-help-link {
352
  font-size: 130%;
353
  padding-left: 10px;
354
  font-style: normal;
355
- }
 
352
  font-size: 130%;
353
  padding-left: 10px;
354
  font-style: normal;
355
+ }
356
+ .no-italics { font-style:normal !important }
pf.php CHANGED
@@ -5,11 +5,12 @@ Plugin Name: Print Friendly and PDF
5
  Plugin URI: http://www.printfriendly.com
6
  Description: PrintFriendly & PDF button for your website. Optimizes your pages and brand for print, pdf, and email.
7
  Name and URL are included to ensure repeat visitors and new visitors when printed versions are shared.
8
- Version: 3.3.3
9
  Author: Print Friendly
10
  Author URI: http://www.PrintFriendly.com
11
 
12
  Changelog :
 
13
  3.3.3 - Using WP content hook for all Buttons
14
  3.3.2 - Algorithm update
15
  3.3.1 - SSL support issue.
@@ -96,7 +97,7 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
96
  * Database version, used to allow for easy upgrades to / additions in plugin options between plugin versions.
97
  * @var int
98
  */
99
- var $db_version = 8;
100
 
101
  /**
102
  * Settings page, used within the plugin to reliably load the plugins admin JS and CSS files only on the admin page.
@@ -130,7 +131,9 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
130
  add_filter( 'the_excerpt', array( &$this, 'show_link' ) );
131
  }
132
 
133
- add_action('the_content', array(&$this, 'add_pf_content_class_around_content_hook'));
 
 
134
 
135
  if ( is_admin() ) {
136
  // Hook into init for registration of the option and the language files
@@ -157,7 +160,7 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
157
  *
158
  **/
159
  function use_wp_content_hook() {
160
- return (($this->options['button_type'] == 'button-print-blu20.png') || ($this->options['button_type'] == "pf-button-both.gif") || ($this->options['button_type'] == "pf-button-big.gif"));
161
  }
162
 
163
  /**
@@ -587,6 +590,10 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
587
  if ( !isset( $input['enable_google_analytics'] ) || !in_array( $input['enable_google_analytics'], array( 'no', 'yes' ) ) ) {
588
  $valid_input['enable_google_analytics'] = "no";
589
  }
 
 
 
 
590
 
591
  /* Database version */
592
  $valid_input['db_version'] = $this->db_version;
@@ -695,6 +702,7 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
695
  'javascript' => 'yes',
696
  'custom_css_url' => '',
697
  'enable_google_analytics' => 'no',
 
698
  // 'category_ids' => array('all'),
699
  );
700
 
@@ -838,7 +846,12 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
838
  if($this->options['db_version'] < 8) {
839
  $this->options['enable_google_analytics'] = 'no';
840
  }
 
 
 
 
841
  $this->options['db_version'] = $this->db_version;
 
842
  update_option( $this->option_name, $this->options );
843
  }
844
 
@@ -1309,10 +1322,10 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
1309
  <option value="yes" <?php $this->selected( 'javascript', 'yes' ); ?>> <?php _e( "Yes", $this->hook ); ?></option>
1310
  <option value="no" <?php $this->selected( 'javascript', 'no' ); ?>> <?php _e( "No", $this->hook ); ?></option>
1311
  </select>
1312
- <span class="description javascript">
1313
  <?php _e( "Preview appears on the page in a Lightbox.", $this->hook ); ?>
1314
  </span>
1315
- <span class="description no-javascript">
1316
  <?php _e( "Preview opens a new browser tab.", $this->hook ); ?>
1317
  </span>
1318
  </label>
@@ -1322,6 +1335,15 @@ if ( ! class_exists( 'PrintFriendly_WordPress' ) ) {
1322
  <option value="no" <?php $this->selected( 'enable_google_analytics', 'no' ); ?>> <?php _e( "No", $this->hook ); ?></option>
1323
  </select>
1324
  </label>
 
 
 
 
 
 
 
 
 
1325
  <p class="submit">
1326
  <input type="submit" class="button-primary" value="<?php esc_attr_e( "Save Options", $this->hook ); ?>"/>
1327
  <input type="reset" class="button-secondary" value="<?php esc_attr_e( "Cancel", $this->hook ); ?>"/>
5
  Plugin URI: http://www.printfriendly.com
6
  Description: PrintFriendly & PDF button for your website. Optimizes your pages and brand for print, pdf, and email.
7
  Name and URL are included to ensure repeat visitors and new visitors when printed versions are shared.
8
+ Version: 3.3.4
9
  Author: Print Friendly
10
  Author URI: http://www.PrintFriendly.com
11
 
12
  Changelog :
13
+ 3.3.4 - Provided Algorithm Options
14
  3.3.3 - Using WP content hook for all Buttons
15
  3.3.2 - Algorithm update
16
  3.3.1 - SSL support issue.
97
  * Database version, used to allow for easy upgrades to / additions in plugin options between plugin versions.
98
  * @var int
99
  */
100
+ var $db_version = 9;
101
 
102
  /**
103
  * Settings page, used within the plugin to reliably load the plugins admin JS and CSS files only on the admin page.
131
  add_filter( 'the_excerpt', array( &$this, 'show_link' ) );
132
  }
133
 
134
+ if($this->use_wp_content_hook()) {
135
+ add_action('the_content', array(&$this, 'add_pf_content_class_around_content_hook'));
136
+ }
137
 
138
  if ( is_admin() ) {
139
  // Hook into init for registration of the option and the language files
160
  *
161
  **/
162
  function use_wp_content_hook() {
163
+ return (isset($this->options['pf_algo']) && $this->options['pf_algo'] == 'wp');
164
  }
165
 
166
  /**
590
  if ( !isset( $input['enable_google_analytics'] ) || !in_array( $input['enable_google_analytics'], array( 'no', 'yes' ) ) ) {
591
  $valid_input['enable_google_analytics'] = "no";
592
  }
593
+
594
+ if ( !isset( $input['pf_algo'] ) || !in_array( $input['pf_algo'], array( 'wp', 'pf' ) ) ) {
595
+ $valid_input['pf_algo'] = "wp";
596
+ }
597
 
598
  /* Database version */
599
  $valid_input['db_version'] = $this->db_version;
702
  'javascript' => 'yes',
703
  'custom_css_url' => '',
704
  'enable_google_analytics' => 'no',
705
+ 'pf_algo' => 'wp'
706
  // 'category_ids' => array('all'),
707
  );
708
 
846
  if($this->options['db_version'] < 8) {
847
  $this->options['enable_google_analytics'] = 'no';
848
  }
849
+
850
+ if($this->options['db_version'] < 9) {
851
+ $this->options['pf_algo'] = 'wp';
852
+ }
853
  $this->options['db_version'] = $this->db_version;
854
+
855
  update_option( $this->option_name, $this->options );
856
  }
857
 
1322
  <option value="yes" <?php $this->selected( 'javascript', 'yes' ); ?>> <?php _e( "Yes", $this->hook ); ?></option>
1323
  <option value="no" <?php $this->selected( 'javascript', 'no' ); ?>> <?php _e( "No", $this->hook ); ?></option>
1324
  </select>
1325
+ <span class="description javascript no-italics">
1326
  <?php _e( "Preview appears on the page in a Lightbox.", $this->hook ); ?>
1327
  </span>
1328
+ <span class="description no-javascript no-italics">
1329
  <?php _e( "Preview opens a new browser tab.", $this->hook ); ?>
1330
  </span>
1331
  </label>
1335
  <option value="no" <?php $this->selected( 'enable_google_analytics', 'no' ); ?>> <?php _e( "No", $this->hook ); ?></option>
1336
  </select>
1337
  </label>
1338
+
1339
+ <label id="pf-algo-usage" <?php /*for="javascript"*/ ?>>My Page Content Selected By: <span class="description no-italics" > Change this setting if your content is not showing in the preview.</span><br>
1340
+ <select id="pf-algo-usage" name="<?php echo $this->option_name; ?>[pf_algo]">
1341
+ <option value="wp" <?php $this->selected( 'pf_algo', 'wp' ); ?>> <?php _e( 'WP "the_content" filter
1342
+ ', $this->hook ); ?></option>
1343
+ <option value="pf" <?php $this->selected( 'pf_algo', 'pf' ); ?>> <?php _e( "Content Algorithm", $this->hook ); ?></option>
1344
+ </select>
1345
+ </label>
1346
+
1347
  <p class="submit">
1348
  <input type="submit" class="button-primary" value="<?php esc_attr_e( "Save Options", $this->hook ); ?>"/>
1349
  <input type="reset" class="button-secondary" value="<?php esc_attr_e( "Cancel", $this->hook ); ?>"/>
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: printfriendly,joostdevalk, jrf
3
  Tags: print, pdf, printer, printing, printable, widget, plugin
4
  Requires at least: 2.8
5
- Tested up to: 3.6
6
- Stable tag: 3.3.3
7
 
8
 
9
  The #1 Print and PDF button for your WordPress site. Printer Friendly pages without coding, css, or print.css. Fast, easy, and professional.
@@ -99,6 +99,9 @@ If you have any other issues with the plugin or the PrintFriendly widget, please
99
 
100
  == Changelog ==
101
 
 
 
 
102
  = 3.3.3 =
103
  * Using WP content hook for all Buttons
104
 
2
  Contributors: printfriendly,joostdevalk, jrf
3
  Tags: print, pdf, printer, printing, printable, widget, plugin
4
  Requires at least: 2.8
5
+ Tested up to: 3.7
6
+ Stable tag: 3.3.4
7
 
8
 
9
  The #1 Print and PDF button for your WordPress site. Printer Friendly pages without coding, css, or print.css. Fast, easy, and professional.
99
 
100
  == Changelog ==
101
 
102
+ = 3.3.4 =
103
+ * Provided Algorithm Options
104
+
105
  = 3.3.3 =
106
  * Using WP content hook for all Buttons
107