Subscribe2 - Version 4.3

Version Description

Download this release

Release Info

Developer MattyRob
Plugin Icon 128x128 Subscribe2
Version 4.3
Comparing to
See all releases

Code changes from version 4.2 to 4.3

ReadMe.txt CHANGED
@@ -1,10 +1,10 @@
1
  === Subscribe2 ===
2
- Contributors: MattyRob, Skippy, Ravan
3
  Donate link: http://subscribe2.wordpress.com/donate/
4
  Tags: posts, subscription, email
5
  Requires at least: 2.0.x
6
- Tested up to: 2.3.1
7
- Stable tag: 4.2
8
 
9
  Sends a list of subscribers an email notification when new posts are published to your blog
10
 
@@ -78,6 +78,18 @@ Batches will occur for each group of message as described above. A site on Drea
78
 
79
  == Version History ==
80
 
 
 
 
 
 
 
 
 
 
 
 
 
81
  Version 4.2 by Matthew Robinson
82
 
83
  * Added translation capability to user feedback strings - thanks to Lise
1
  === Subscribe2 ===
2
+ Contributors: MattyRob, Skippy, RavanH
3
  Donate link: http://subscribe2.wordpress.com/donate/
4
  Tags: posts, subscription, email
5
  Requires at least: 2.0.x
6
+ Tested up to: 2.3.2
7
+ Stable tag: 4.3
8
 
9
  Sends a list of subscribers an email notification when new posts are published to your blog
10
 
78
 
79
  == Version History ==
80
 
81
+ Version 4.3 by Matthew Robinson
82
+
83
+ * Fixed bug where digest emails were sent to unsubscribed users - Thanks to Mr Papa
84
+ * Stripped slashes from Subject when sending from Write->Mail Subscribers - Thanks to James
85
+ * Ensured all admin pages created by Subscribe2 are valid XHTML 1.0 Transitional code
86
+ * Added default mail templates and other missed string values to i18n files to allow easier first time translation - thanks to Kjell
87
+ * Added option to set the hour for digest email notifications provided the schedule interval is one day or greater
88
+ * Moved option variable declaration to ensure better caching
89
+ * Fixed bug where cron tasks were not removed when options were reset
90
+ * Fixed email notifications for future dated posts
91
+ * Fixed QuickTag Icons and mouse-over floating text
92
+
93
  Version 4.2 by Matthew Robinson
94
 
95
  * Added translation capability to user feedback strings - thanks to Lise
subscribe2/include/options.php CHANGED
@@ -52,14 +52,14 @@ if (!isset($this->subscribe2_options['barred'])) {
52
  } // option containing domains barred from public registration
53
 
54
  if (!isset($this->subscribe2_options['mailtext'])) {
55
- $this->subscribe2_options['mailtext'] = "BLOGNAME has posted a new item, 'TITLE'\n\nPOST\n\nYou may view the latest post at\nPERMALINK\n\nYou received this e-mail because you asked to be notified when new updates are posted.\nBest regards,\nMYNAME\nEMAIL";
56
  } // Default notification email text
57
 
58
  if (!isset($this->subscribe2_options['confirm_email'])) {
59
- $this->subscribe2_options['confirm_email'] = "BLOGNAME has received a request to ACTION for this email address. To complete your request please click on the link below:\n\nLINK\n\nIf you did not request this, please feel free to disregard this notice!\n\nThank you,\nMYNAME.";
60
  } // Default confirmation email text
61
 
62
  if (!isset($this->subscribe2_options['remind_email'])) {
63
- $this->subscribe2_options['remind_email'] = "This email address was subscribed for notifications at BLOGNAME (BLOGLINK) but the subscription remains incomplete.\n\nIf you wish to complete your subscription please click on the link below:\n\nLINK\n\nIf you do not wish to complete your subscription please ignore this email and your address will be removed from our database.\n\nRegards,\nMYNAME";
64
  } // Default reminder email text
65
  ?>
52
  } // option containing domains barred from public registration
53
 
54
  if (!isset($this->subscribe2_options['mailtext'])) {
55
+ $this->subscribe2_options['mailtext'] = __("BLOGNAME has posted a new item, 'TITLE'\n\nPOST\n\nYou may view the latest post at\nPERMALINK\n\nYou received this e-mail because you asked to be notified when new updates are posted.\nBest regards,\nMYNAME\nEMAIL", "subscribe2");
56
  } // Default notification email text
57
 
58
  if (!isset($this->subscribe2_options['confirm_email'])) {
59
+ $this->subscribe2_options['confirm_email'] = __("BLOGNAME has received a request to ACTION for this email address. To complete your request please click on the link below:\n\nLINK\n\nIf you did not request this, please feel free to disregard this notice!\n\nThank you,\nMYNAME.", "subscribe2");
60
  } // Default confirmation email text
61
 
62
  if (!isset($this->subscribe2_options['remind_email'])) {
63
+ $this->subscribe2_options['remind_email'] = __("This email address was subscribed for notifications at BLOGNAME (BLOGLINK) but the subscription remains incomplete.\n\nIf you wish to complete your subscription please click on the link below:\n\nLINK\n\nIf you do not wish to complete your subscription please ignore this email and your address will be removed from our database.\n\nRegards,\nMYNAME", "subscribe2");
64
  } // Default reminder email text
65
  ?>
subscribe2/subscribe2.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
- Version: 4.2
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  */
@@ -41,7 +41,7 @@ define('S2PAGE', '0');
41
 
42
  // our version number. Don't touch this or any line below
43
  // unless you know exacly what you are doing
44
- define('S2VERSION', '4.2');
45
  define ('S2PATH', trailingslashit(dirname(__FILE__)));
46
 
47
  // use Owen's excellent ButtonSnap library
@@ -204,6 +204,7 @@ class s2class {
204
  */
205
  function reset() {
206
  delete_option('subscribe2_options');
 
207
  unset($this->subscribe2_options);
208
  require(S2PATH . "include/options.php");
209
  update_option('subscribe2_options', $this->subscribe2_options);
@@ -876,7 +877,7 @@ class s2class {
876
  // ensure existing subscriptions are not overwritten on upgrade
877
  if (empty($check)) {
878
  if ( ('yes' == $this->subscribe2_options['autosub']) || (('wpreg' == $this->subscribe2_options['autosub']) && (1 == $wpreg)) ) {
879
- // don't add entires by default if autosub is off, messes up daily digests
880
  update_usermeta($user_id, 's2_subscribed', $cats);
881
  foreach(explode(',', $cats) as $cat) {
882
  update_usermeta($user_id, 's2_cat' . $cat, "$cat");
@@ -1034,25 +1035,25 @@ class s2class {
1034
  }
1035
  }
1036
  $_POST['what'] = 'confirmed';
1037
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . __('Address(es) subscribed!', 'subscribe2') . "</p></strong></div>";
1038
  } elseif ('delete' == $_POST['s2_admin']) {
1039
  $this->delete($_POST['email']);
1040
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . $_POST['email'] . ' ' . __('deleted!', 'subscribe2') . "</p></strong></div>";
1041
  } elseif ('toggle' == $_POST['s2_admin']) {
1042
  $this->toggle($_POST['email']);
1043
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . $_POST['email'] . ' ' . __('status changed!', 'subscribe2') . "</p></strong></div>";
1044
  } elseif ('remind' == $_POST['s2_admin']) {
1045
  $this->remind($_POST['reminderemails']);
1046
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . __('Reminder Email(s) Sent!','subscribe2') . "</p></strong></div>";
1047
  } elseif ('exportcsv' == $_POST['s2_admin']) {
1048
  $this->exportcsv($_POST['exportcsv']);
1049
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . __('CSV File Created in wp-content','subscribe2') . "</p></strong></div>";
1050
  } elseif ( ('register' == $_POST['s2_admin']) && ('subscribe' == $_POST['manage']) ) {
1051
  $this->subscribe_registered_users($_POST['emails'], $_POST['category']);
1052
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . __('Registered Users Subscribed!','subscribe2') . "</p></strong></div>";
1053
  } elseif ( ('register' == $_POST['s2_admin']) && ('unsubscribe' == $_POST['manage']) ) {
1054
  $this->unsubscribe_registered_users($_POST['emails'], $_POST['category']);
1055
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>" . __('Registered Users Unsubscribed!','subscribe2') . "</p></strong></div>";
1056
  }
1057
  }
1058
 
@@ -1242,7 +1243,7 @@ class s2class {
1242
  check_admin_referer('subscribe2-options_subscribers' . $s2nonce);
1243
  if ('RESET' == $_POST['s2_admin']) {
1244
  $this->reset();
1245
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>$this->options_reset</p></strong></div>";
1246
  } elseif ('options' == $_POST['s2_admin']) {
1247
  // excluded categories
1248
  if (!empty($_POST['category'])) {
@@ -1299,7 +1300,7 @@ class s2class {
1299
  $timestamp = &$time;
1300
  } else {
1301
  // Schedule other CRON events starting at midnight and periodically thereafter
1302
- $timestamp = mktime(0, 0, 0, date('m', $time), date('d', $time), date('Y', $time));
1303
  }
1304
  if ( ('on' == $_POST['reset_cron']) || $check ) {
1305
  wp_schedule_event($timestamp, $email_freq, 's2_digest_cron');
@@ -1330,7 +1331,7 @@ class s2class {
1330
  //barred domains
1331
  $barred_option = $_POST['barred'];
1332
  $this->subscribe2_options['barred'] = $barred_option;
1333
- echo "<div id=\"message\" class=\"updated fade\"><strong><p>$this->options_saved</p></strong></div>";
1334
  update_option('subscribe2_options', $this->subscribe2_options);
1335
  }
1336
  }
@@ -1599,18 +1600,18 @@ class s2class {
1599
  }
1600
  echo " /> " . $value . "&nbsp;&nbsp;";
1601
  }
1602
- echo "<p style=\"color: red\">" . __('Note: HTML format will always deliver the full post.', 'subscribe2') . "</p>\r\n";
1603
  echo __('Automatically subscribe me to newly created categories', 'subscribe2') . ': &nbsp;&nbsp;';
1604
  echo "<input type=\"radio\" name=\"new_category\" value=\"yes\" ";
1605
  if ('yes' == get_usermeta($user_ID, 's2_autosub')) {
1606
  echo "checked=\"checked\" ";
1607
  }
1608
- echo "/> Yes &nbsp;&nbsp;";
1609
  echo "<input type=\"radio\" name=\"new_category\" value=\"no\" ";
1610
  if ('no' == get_usermeta($user_ID, 's2_autosub')) {
1611
  echo "checked=\"checked\" ";
1612
  }
1613
- echo "/> No<br /><br />";
1614
 
1615
  // subscribed categories
1616
  echo "<h2>" . __('Subscribed Categories', 'subscribe2') . "</h2>\r\n";
@@ -1623,15 +1624,15 @@ class s2class {
1623
  if (get_usermeta($user_ID, 's2_subscribed') != '-1') {
1624
  echo "checked=\"yes\" ";
1625
  }
1626
- echo "/> Yes <input type=\"radio\" name=\"category\" value=\"-1\" ";
1627
  if (get_usermeta($user_ID, 's2_subscribed') == '-1') {
1628
  echo "checked=\"yes\" ";
1629
  }
1630
- echo "/> No";
1631
  }
1632
 
1633
  // submit
1634
- echo "<p class=\"submit\"><input type=\"submit\" name=\"submit\" value=\"" . __("Update Preferences &raquo;", 'subscribe2') . "\" /></p>";
1635
  echo "</form></div>\r\n";
1636
 
1637
  include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -1666,7 +1667,7 @@ class s2class {
1666
  get_currentuserinfo();
1667
  $this->myname = $user_identity;
1668
  $this->myemail = $user_email;
1669
- $subject = strip_tags($_POST['subject']);
1670
  $message = stripslashes($_POST['message']);
1671
  $this->mail($recipients, $subject, $message, 'text');
1672
  $message = $this->mail_sent;
@@ -1818,6 +1819,7 @@ class s2class {
1818
 
1819
  function display_digest_choices() {
1820
  global $wpdb;
 
1821
  $schedule = (array)wp_get_schedules();
1822
  $schedule = array_merge(array('never' => array('interval' => 0, 'display' => __('Per Post Email','subscribe2'))), $schedule);
1823
  $sort = array();
@@ -1834,7 +1836,20 @@ class s2class {
1834
  }
1835
  echo " /> " . $value['display'] . "<br />\r\n";
1836
  }
1837
- if (wp_next_scheduled('s2_digest_cron')) {
 
 
 
 
 
 
 
 
 
 
 
 
 
1838
  echo "<p><input type=\"checkbox\" name=\"reset_cron\" /> " . __('Reset the schedule time and date for periodic email notifications', 'subscribe2') . "</p>\r\n";
1839
  $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
1840
  $now = time();
@@ -2055,6 +2070,8 @@ class s2class {
2055
  foreach ($posts as $post) {
2056
  $post_cats = wp_get_post_categories($post->ID);
2057
  $post_cats_string = implode(',', $post_cats);
 
 
2058
  $check = false;
2059
  // is the current post assigned to any categories
2060
  // which should not generate a notification email?
@@ -2120,7 +2137,8 @@ class s2class {
2120
  $display = $scheds[$email_freq]['display'];
2121
  $subject = '[' . stripslashes(get_option('blogname')) . '] ' . $display . ' ' . __('Digest Email', 'subscribe2');
2122
  $public = $this->get_public();
2123
- $registered = $this->get_registered();
 
2124
  $recipients = array_merge((array)$public, (array)$registered);
2125
  $mailtext = $this->substitute(stripslashes($this->subscribe2_options['mailtext']));
2126
  $body = str_replace("TABLE", $table, $mailtext);
@@ -2134,7 +2152,6 @@ class s2class {
2134
  */
2135
  function s2init() {
2136
  // load the options
2137
- $this->subscribe2_options = array();
2138
  $this->subscribe2_options = get_option('subscribe2_options');
2139
 
2140
  add_action('init', array(&$this, 'subscribe2'));
@@ -2196,6 +2213,7 @@ class s2class {
2196
  add_action('draft_to_publish', array(&$this, 'publish'));
2197
  add_action('pending_to_publish', array(&$this, 'publish'));
2198
  add_action('private_to_publish', array(&$this, 'publish'));
 
2199
  if ($this->subscribe2_options['password'] == "yes") {
2200
  add_action('new_to_private', array(&$this, 'publish'));
2201
  add_action('draft_to_private', array(&$this, 'publish'));
@@ -2276,6 +2294,7 @@ class s2class {
2276
  /* ===== our variables ===== */
2277
  // cache variables
2278
  var $version = '';
 
2279
  var $all_public = '';
2280
  var $all_unconfirmed = '';
2281
  var $excluded_cats = '';
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 4.3
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  */
41
 
42
  // our version number. Don't touch this or any line below
43
  // unless you know exacly what you are doing
44
+ define('S2VERSION', '4.3');
45
  define ('S2PATH', trailingslashit(dirname(__FILE__)));
46
 
47
  // use Owen's excellent ButtonSnap library
204
  */
205
  function reset() {
206
  delete_option('subscribe2_options');
207
+ wp_clear_scheduled_hook('s2_digest_cron');
208
  unset($this->subscribe2_options);
209
  require(S2PATH . "include/options.php");
210
  update_option('subscribe2_options', $this->subscribe2_options);
877
  // ensure existing subscriptions are not overwritten on upgrade
878
  if (empty($check)) {
879
  if ( ('yes' == $this->subscribe2_options['autosub']) || (('wpreg' == $this->subscribe2_options['autosub']) && (1 == $wpreg)) ) {
880
+ // don't add entries by default if autosub is off, messes up daily digests
881
  update_usermeta($user_id, 's2_subscribed', $cats);
882
  foreach(explode(',', $cats) as $cat) {
883
  update_usermeta($user_id, 's2_cat' . $cat, "$cat");
1035
  }
1036
  }
1037
  $_POST['what'] = 'confirmed';
1038
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . __('Address(es) subscribed!', 'subscribe2') . "</strong></p></div>";
1039
  } elseif ('delete' == $_POST['s2_admin']) {
1040
  $this->delete($_POST['email']);
1041
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . $_POST['email'] . ' ' . __('deleted!', 'subscribe2') . "</strong</p>></div>";
1042
  } elseif ('toggle' == $_POST['s2_admin']) {
1043
  $this->toggle($_POST['email']);
1044
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . $_POST['email'] . ' ' . __('status changed!', 'subscribe2') . "</strong></p></div>";
1045
  } elseif ('remind' == $_POST['s2_admin']) {
1046
  $this->remind($_POST['reminderemails']);
1047
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . __('Reminder Email(s) Sent!','subscribe2') . "</strong></p></div>";
1048
  } elseif ('exportcsv' == $_POST['s2_admin']) {
1049
  $this->exportcsv($_POST['exportcsv']);
1050
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . __('CSV File Created in wp-content','subscribe2') . "</strong></p></div>";
1051
  } elseif ( ('register' == $_POST['s2_admin']) && ('subscribe' == $_POST['manage']) ) {
1052
  $this->subscribe_registered_users($_POST['emails'], $_POST['category']);
1053
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . __('Registered Users Subscribed!','subscribe2') . "</strong></p></div>";
1054
  } elseif ( ('register' == $_POST['s2_admin']) && ('unsubscribe' == $_POST['manage']) ) {
1055
  $this->unsubscribe_registered_users($_POST['emails'], $_POST['category']);
1056
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>" . __('Registered Users Unsubscribed!','subscribe2') . "</strong></p></div>";
1057
  }
1058
  }
1059
 
1243
  check_admin_referer('subscribe2-options_subscribers' . $s2nonce);
1244
  if ('RESET' == $_POST['s2_admin']) {
1245
  $this->reset();
1246
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>$this->options_reset</strong></p></div>";
1247
  } elseif ('options' == $_POST['s2_admin']) {
1248
  // excluded categories
1249
  if (!empty($_POST['category'])) {
1300
  $timestamp = &$time;
1301
  } else {
1302
  // Schedule other CRON events starting at midnight and periodically thereafter
1303
+ $timestamp = mktime($_POST['hour'], 0, 0, date('m', $time), date('d', $time), date('Y', $time));
1304
  }
1305
  if ( ('on' == $_POST['reset_cron']) || $check ) {
1306
  wp_schedule_event($timestamp, $email_freq, 's2_digest_cron');
1331
  //barred domains
1332
  $barred_option = $_POST['barred'];
1333
  $this->subscribe2_options['barred'] = $barred_option;
1334
+ echo "<div id=\"message\" class=\"updated fade\"><p><strong>$this->options_saved</strong></p></div>";
1335
  update_option('subscribe2_options', $this->subscribe2_options);
1336
  }
1337
  }
1600
  }
1601
  echo " /> " . $value . "&nbsp;&nbsp;";
1602
  }
1603
+ echo "<p style=\"color: red\">" . __('Note: HTML format will always deliver the full post', 'subscribe2') . ".</p>\r\n";
1604
  echo __('Automatically subscribe me to newly created categories', 'subscribe2') . ': &nbsp;&nbsp;';
1605
  echo "<input type=\"radio\" name=\"new_category\" value=\"yes\" ";
1606
  if ('yes' == get_usermeta($user_ID, 's2_autosub')) {
1607
  echo "checked=\"checked\" ";
1608
  }
1609
+ echo "/> " . __('Yes', 'subscribe2') . "&nbsp;&nbsp;";
1610
  echo "<input type=\"radio\" name=\"new_category\" value=\"no\" ";
1611
  if ('no' == get_usermeta($user_ID, 's2_autosub')) {
1612
  echo "checked=\"checked\" ";
1613
  }
1614
+ echo "/> " . __('No', 'subscribe2') . "<br /><br />";
1615
 
1616
  // subscribed categories
1617
  echo "<h2>" . __('Subscribed Categories', 'subscribe2') . "</h2>\r\n";
1624
  if (get_usermeta($user_ID, 's2_subscribed') != '-1') {
1625
  echo "checked=\"yes\" ";
1626
  }
1627
+ echo "/> " . __('Yes', 'subscribe2') . "<input type=\"radio\" name=\"category\" value=\"-1\" ";
1628
  if (get_usermeta($user_ID, 's2_subscribed') == '-1') {
1629
  echo "checked=\"yes\" ";
1630
  }
1631
+ echo "/> " . __('No', 'subscribe2');
1632
  }
1633
 
1634
  // submit
1635
+ echo "<p class=\"submit\"><input type=\"submit\" name=\"submit\" value=\"" . __("Update Preferences", 'subscribe2') . " &raquo;\" /></p>";
1636
  echo "</form></div>\r\n";
1637
 
1638
  include(ABSPATH . 'wp-admin/admin-footer.php');
1667
  get_currentuserinfo();
1668
  $this->myname = $user_identity;
1669
  $this->myemail = $user_email;
1670
+ $subject = stripslashes(strip_tags($_POST['subject']));
1671
  $message = stripslashes($_POST['message']);
1672
  $this->mail($recipients, $subject, $message, 'text');
1673
  $message = $this->mail_sent;
1819
 
1820
  function display_digest_choices() {
1821
  global $wpdb;
1822
+ $scheduled_time = wp_next_scheduled('s2_digest_cron');
1823
  $schedule = (array)wp_get_schedules();
1824
  $schedule = array_merge(array('never' => array('interval' => 0, 'display' => __('Per Post Email','subscribe2'))), $schedule);
1825
  $sort = array();
1836
  }
1837
  echo " /> " . $value['display'] . "<br />\r\n";
1838
  }
1839
+ echo "<br />" . __('Send Digest Notification at', 'subscribe2') . ": \r\n";
1840
+ $hours = array('12am', '1am', '2am', '3am', '4am', '5am', '6am', '7am', '8am', '9am' ,'10am' ,'11am', '12pm', '1pm', '2pm', '3pm', '4pm', '5pm', '6pm', '7pm', '8pm', '9pm', '10pm', '11pm');
1841
+ echo "<select name=\"hour\">\r\n";
1842
+ while ($hour = current($hours)) {
1843
+ echo "<option value=\"" . key($hours) . "\"";
1844
+ if (key($hours) == date('H', $scheduled_time)) {
1845
+ echo " selected=\"selected\"";
1846
+ }
1847
+ echo ">" . $hour . "</option>\r\n";
1848
+ next($hours);
1849
+ }
1850
+ echo "</select>\r\n";
1851
+ echo "<strong><em style=\"color: red\">" . __('This option will work for digest notification sent daily or less frequently', 'subscribe2') . "</em></strong>\r\n";
1852
+ if ($scheduled_time) {
1853
  echo "<p><input type=\"checkbox\" name=\"reset_cron\" /> " . __('Reset the schedule time and date for periodic email notifications', 'subscribe2') . "</p>\r\n";
1854
  $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
1855
  $now = time();
2070
  foreach ($posts as $post) {
2071
  $post_cats = wp_get_post_categories($post->ID);
2072
  $post_cats_string = implode(',', $post_cats);
2073
+ $diff = array_diff($post_cats, $all_post_cats);
2074
+ $all_post_cats = array_merge(array($all_post_cats), array($diff));
2075
  $check = false;
2076
  // is the current post assigned to any categories
2077
  // which should not generate a notification email?
2137
  $display = $scheds[$email_freq]['display'];
2138
  $subject = '[' . stripslashes(get_option('blogname')) . '] ' . $display . ' ' . __('Digest Email', 'subscribe2');
2139
  $public = $this->get_public();
2140
+ $all_post_cats_string = implode(',', $all_post_cats);
2141
+ $registered = $this->get_registered("cats=$all_post_cats_string");
2142
  $recipients = array_merge((array)$public, (array)$registered);
2143
  $mailtext = $this->substitute(stripslashes($this->subscribe2_options['mailtext']));
2144
  $body = str_replace("TABLE", $table, $mailtext);
2152
  */
2153
  function s2init() {
2154
  // load the options
 
2155
  $this->subscribe2_options = get_option('subscribe2_options');
2156
 
2157
  add_action('init', array(&$this, 'subscribe2'));
2213
  add_action('draft_to_publish', array(&$this, 'publish'));
2214
  add_action('pending_to_publish', array(&$this, 'publish'));
2215
  add_action('private_to_publish', array(&$this, 'publish'));
2216
+ add_action('future_to_publish', array(&$this, 'publish'));
2217
  if ($this->subscribe2_options['password'] == "yes") {
2218
  add_action('new_to_private', array(&$this, 'publish'));
2219
  add_action('draft_to_private', array(&$this, 'publish'));
2294
  /* ===== our variables ===== */
2295
  // cache variables
2296
  var $version = '';
2297
+ var $subscribe2_options = array();
2298
  var $all_public = '';
2299
  var $all_unconfirmed = '';
2300
  var $excluded_cats = '';
subscribe2/subscribe2.pot CHANGED
@@ -8,7 +8,7 @@ msgid ""
8
  msgstr ""
9
  "Project-Id-Version: PACKAGE VERSION\n"
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2007-11-20 18:28+0000\n"
12
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,15 +62,15 @@ msgstr ""
62
  msgid "Your email:"
63
  msgstr ""
64
 
65
- #: subscribe2.php:81 subscribe2.php:1124 subscribe2.php:1220
66
  msgid "Subscribe"
67
  msgstr ""
68
 
69
- #: subscribe2.php:81 subscribe2.php:1221
70
  msgid "Unsubscribe"
71
  msgstr ""
72
 
73
- #: subscribe2.php:81 subscribe2.php:1690
74
  msgid "Send"
75
  msgstr ""
76
 
@@ -110,7 +110,7 @@ msgstr ""
110
  msgid "Options reset!"
111
  msgstr ""
112
 
113
- #: subscribe2.php:108 subscribe2.php:1129
114
  msgid "Subscribers"
115
  msgstr ""
116
 
@@ -118,7 +118,7 @@ msgstr ""
118
  msgid "Subscribe2 Options"
119
  msgstr ""
120
 
121
- #: subscribe2.php:109 subscribe2.php:1994 subscribe2.php:2224
122
  msgid "Subscribe2"
123
  msgstr ""
124
 
@@ -134,400 +134,455 @@ msgstr ""
134
  msgid "Once Weekly"
135
  msgstr ""
136
 
137
- #: subscribe2.php:686
138
  msgid "New subscriber"
139
  msgstr ""
140
 
141
- #: subscribe2.php:687
142
  msgid "subscribed to email notifications!"
143
  msgstr ""
144
 
145
- #: subscribe2.php:1037
146
  msgid "Address(es) subscribed!"
147
  msgstr ""
148
 
149
- #: subscribe2.php:1040
150
  msgid "deleted!"
151
  msgstr ""
152
 
153
- #: subscribe2.php:1043
154
  msgid "status changed!"
155
  msgstr ""
156
 
157
- #: subscribe2.php:1046
158
  msgid "Reminder Email(s) Sent!"
159
  msgstr ""
160
 
161
- #: subscribe2.php:1049
162
  msgid "CSV File Created in wp-content"
163
  msgstr ""
164
 
165
- #: subscribe2.php:1052
166
  msgid "Registered Users Subscribed!"
167
  msgstr ""
168
 
169
- #: subscribe2.php:1055
170
  msgid "Registered Users Unsubscribed!"
171
  msgstr ""
172
 
173
- #: subscribe2.php:1117
174
  msgid "Subscribe Addresses"
175
  msgstr ""
176
 
177
- #: subscribe2.php:1122
178
  msgid "Enter addresses, one per line or comma-seperated"
179
  msgstr ""
180
 
181
- #: subscribe2.php:1131
182
  msgid "Filter"
183
  msgstr ""
184
 
185
- #: subscribe2.php:1135
186
  msgid ""
187
  "Registered on the left, confirmed in the middle, unconfirmed on the right"
188
  msgstr ""
189
 
190
- #: subscribe2.php:1144
191
  msgid "Save Emails to CSV File"
192
  msgstr ""
193
 
194
- #: subscribe2.php:1195
195
  msgid "NONE"
196
  msgstr ""
197
 
198
- #: subscribe2.php:1205
199
  msgid "Send Reminder Email"
200
  msgstr ""
201
 
202
- #: subscribe2.php:1212
203
  msgid "Categories"
204
  msgstr ""
205
 
206
- #: subscribe2.php:1213
207
  msgid ""
208
  "Existing Registered Users can be automatically (un)subscribed to categories "
209
  "using this section."
210
  msgstr ""
211
 
212
- #: subscribe2.php:1214
213
  msgid "Consider User Privacy as changes cannot be undone"
214
  msgstr ""
215
 
216
- #: subscribe2.php:1219
217
  msgid "Action to perform"
218
  msgstr ""
219
 
220
- #: subscribe2.php:1224 subscribe2.php:1487
221
  msgid "Submit"
222
  msgstr ""
223
 
224
- #: subscribe2.php:1344
225
  msgid "Delivery Options"
226
  msgstr ""
227
 
228
- #: subscribe2.php:1345
229
  msgid "Send Emails for Pages"
230
  msgstr ""
231
 
232
- #: subscribe2.php:1350 subscribe2.php:1361 subscribe2.php:1458
 
233
  msgid "Yes"
234
  msgstr ""
235
 
236
- #: subscribe2.php:1355 subscribe2.php:1366 subscribe2.php:1452
237
- #: subscribe2.php:1463
238
  msgid "No"
239
  msgstr ""
240
 
241
- #: subscribe2.php:1356
242
  msgid "Send Emails for Password Protected Posts"
243
  msgstr ""
244
 
245
- #: subscribe2.php:1367
246
  msgid "Send Email From"
247
  msgstr ""
248
 
249
- #: subscribe2.php:1372
250
  msgid "Author of the post"
251
  msgstr ""
252
 
253
- #: subscribe2.php:1377
254
  msgid "Blog Admin"
255
  msgstr ""
256
 
257
- #: subscribe2.php:1379
258
  msgid "Send Email as Digest"
259
  msgstr ""
260
 
261
- #: subscribe2.php:1382
262
  msgid "Email Templates"
263
  msgstr ""
264
 
265
- #: subscribe2.php:1385
266
  msgid "New Post email (must not be empty)"
267
  msgstr ""
268
 
269
- #: subscribe2.php:1389
270
  msgid "Message substitions"
271
  msgstr ""
272
 
273
- #: subscribe2.php:1393
274
  msgid "the post's title"
275
  msgstr ""
276
 
277
- #: subscribe2.php:1394
278
  msgid ""
279
  "the excerpt or the entire post<br />(<i>based on the subscriber's "
280
  "preferences</i>)"
281
  msgstr ""
282
 
283
- #: subscribe2.php:1395
284
  msgid "a list of post titles (for digest emails)"
285
  msgstr ""
286
 
287
- #: subscribe2.php:1396
288
  msgid "the post's permalink"
289
  msgstr ""
290
 
291
- #: subscribe2.php:1397
292
  msgid "the admin or post author's name"
293
  msgstr ""
294
 
295
- #: subscribe2.php:1398
296
  msgid "the admin or post author's email"
297
  msgstr ""
298
 
299
- #: subscribe2.php:1399
300
  msgid "the post author's name"
301
  msgstr ""
302
 
303
- #: subscribe2.php:1400
304
  msgid ""
305
  "the generated link to confirm a request<br />(<i>only used in the "
306
  "confirmation email template</i>)"
307
  msgstr ""
308
 
309
- #: subscribe2.php:1401
310
  msgid ""
311
  "Action performed by LINK in confirmation email<br />(<i>only used in the "
312
  "confirmation email template</i>)"
313
  msgstr ""
314
 
315
- #: subscribe2.php:1403
316
  msgid "Subscribe / Unsubscribe confirmation email"
317
  msgstr ""
318
 
319
- #: subscribe2.php:1406
320
  msgid "Reminder email to Unconfirmed Subscribers"
321
  msgstr ""
322
 
323
- #: subscribe2.php:1411
324
  msgid "Excluded Categories"
325
  msgstr ""
326
 
327
- #: subscribe2.php:1412
328
  msgid ""
329
  "Posts assigned to any Excluded Category do not generate notifications and "
330
  "are not included in digest notifications"
331
  msgstr ""
332
 
333
- #: subscribe2.php:1418
334
  msgid "Allow registered users to subscribe to excluded categories?"
335
  msgstr ""
336
 
337
- #: subscribe2.php:1421
338
  msgid "Writing Options"
339
  msgstr ""
340
 
341
- #: subscribe2.php:1426
342
  msgid "Show the Subscribe2 button on the Write toolbar?"
343
  msgstr ""
344
 
345
- #: subscribe2.php:1433
346
  msgid "Enable Subscribe2 Widget?"
347
  msgstr ""
348
 
349
- #: subscribe2.php:1436
350
  msgid "Auto Subscribe"
351
  msgstr ""
352
 
353
- #: subscribe2.php:1437
354
  msgid "Subscribe new users registering with your blog"
355
  msgstr ""
356
 
357
- #: subscribe2.php:1442
358
  msgid "Automatically"
359
  msgstr ""
360
 
361
- #: subscribe2.php:1447
362
  msgid "Display option on Registration Form"
363
  msgstr ""
364
 
365
- #: subscribe2.php:1453
366
  msgid "Registration Form option is checked by default"
367
  msgstr ""
368
 
369
- #: subscribe2.php:1464
370
  msgid "Auto-subscribe users to receive email as"
371
  msgstr ""
372
 
373
- #: subscribe2.php:1469 subscribe2.php:1586
374
  msgid "HTML"
375
  msgstr ""
376
 
377
- #: subscribe2.php:1474
378
  msgid "Plain Text - Full"
379
  msgstr ""
380
 
381
- #: subscribe2.php:1479
382
  msgid "Plain Text - Excerpt"
383
  msgstr ""
384
 
385
- #: subscribe2.php:1482
386
  msgid "Barred Domains"
387
  msgstr ""
388
 
389
- #: subscribe2.php:1483
390
  msgid ""
391
  "Enter domains to bar from public subscriptions: <br /> (Use a new line for "
392
  "each entry and omit the \"@\" symbol, for example email.com)"
393
  msgstr ""
394
 
395
- #: subscribe2.php:1492
396
  msgid "Reset Default"
397
  msgstr ""
398
 
399
- #: subscribe2.php:1493
400
  msgid ""
401
  "Use this to reset all options to their defaults. This <strong><em>will not</"
402
  "em></strong> modify your list of subscribers."
403
  msgstr ""
404
 
405
- #: subscribe2.php:1500
406
  msgid "RESET"
407
  msgstr ""
408
 
409
- #: subscribe2.php:1520
410
  msgid "Subscription preferences updated."
411
  msgstr ""
412
 
413
- #: subscribe2.php:1574
414
  msgid "Notification Settings"
415
  msgstr ""
416
 
417
- #: subscribe2.php:1581
418
  msgid "Receive email as"
419
  msgstr ""
420
 
421
- #: subscribe2.php:1591
422
  msgid "Plain Text"
423
  msgstr ""
424
 
425
- #: subscribe2.php:1593
426
  msgid "Email contains"
427
  msgstr ""
428
 
429
- #: subscribe2.php:1594
430
  msgid "Excerpt Only"
431
  msgstr ""
432
 
433
- #: subscribe2.php:1594
434
  msgid "Full Post"
435
  msgstr ""
436
 
437
- #: subscribe2.php:1602
438
- msgid "Note: HTML format will always deliver the full post."
439
  msgstr ""
440
 
441
- #: subscribe2.php:1603
442
  msgid "Automatically subscribe me to newly created categories"
443
  msgstr ""
444
 
445
- #: subscribe2.php:1616
446
  msgid "Subscribed Categories"
447
  msgstr ""
448
 
449
- #: subscribe2.php:1621
450
  msgid "Receive daily summary of new posts?"
451
  msgstr ""
452
 
453
- #: subscribe2.php:1634
454
- msgid "Update Preferences &raquo;"
455
  msgstr ""
456
 
457
- #: subscribe2.php:1679
458
  msgid "Send email to all subscribers"
459
  msgstr ""
460
 
461
- #: subscribe2.php:1684
462
  msgid "Subject"
463
  msgstr ""
464
 
465
- #: subscribe2.php:1684
466
  msgid "A message from "
467
  msgstr ""
468
 
469
- #: subscribe2.php:1687
470
  msgid "Recipients: "
471
  msgstr ""
472
 
473
- #: subscribe2.php:1749
474
  msgid "Select / Unselect All"
475
  msgstr ""
476
 
477
- #: subscribe2.php:1762
478
  msgid "All Subscribers"
479
  msgstr ""
480
 
481
- #: subscribe2.php:1763
482
  msgid "Public Subscribers"
483
  msgstr ""
484
 
485
- #: subscribe2.php:1764
486
  msgid "Confirmed"
487
  msgstr ""
488
 
489
- #: subscribe2.php:1765
490
  msgid "Unconfirmed"
491
  msgstr ""
492
 
493
- #: subscribe2.php:1766
494
  msgid "Registered Users"
495
  msgstr ""
496
 
497
- #: subscribe2.php:1822
498
  msgid "Per Post Email"
499
  msgstr ""
500
 
501
- #: subscribe2.php:1838
 
 
 
 
 
 
 
 
 
502
  msgid "Reset the schedule time and date for periodic email notifications"
503
  msgstr ""
504
 
505
- #: subscribe2.php:1841
506
  msgid "Current server time is"
507
  msgstr ""
508
 
509
- #: subscribe2.php:1843
510
  msgid "Next email notification will be sent"
511
  msgstr ""
512
 
513
- #: subscribe2.php:1856
514
  msgid "Check here to Subscribe to email notifications for new posts"
515
  msgstr ""
516
 
517
- #: subscribe2.php:1865
518
  msgid ""
519
  "By Registering with this blog you are also agreeing to recieve email "
520
  "notifications for new posts"
521
  msgstr ""
522
 
523
- #: subscribe2.php:1983
524
  msgid "Subscription Confirmation"
525
  msgstr ""
526
 
527
- #: subscribe2.php:2017
528
  msgid "Title:"
529
  msgstr ""
530
 
531
- #: subscribe2.php:2121
532
  msgid "Digest Email"
533
  msgstr ""
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
8
  msgstr ""
9
  "Project-Id-Version: PACKAGE VERSION\n"
10
  "Report-Msgid-Bugs-To: \n"
11
+ "POT-Creation-Date: 2008-01-08 20:13+0000\n"
12
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
62
  msgid "Your email:"
63
  msgstr ""
64
 
65
+ #: subscribe2.php:81 subscribe2.php:1125 subscribe2.php:1221
66
  msgid "Subscribe"
67
  msgstr ""
68
 
69
+ #: subscribe2.php:81 subscribe2.php:1222
70
  msgid "Unsubscribe"
71
  msgstr ""
72
 
73
+ #: subscribe2.php:81 subscribe2.php:1691
74
  msgid "Send"
75
  msgstr ""
76
 
110
  msgid "Options reset!"
111
  msgstr ""
112
 
113
+ #: subscribe2.php:108 subscribe2.php:1130
114
  msgid "Subscribers"
115
  msgstr ""
116
 
118
  msgid "Subscribe2 Options"
119
  msgstr ""
120
 
121
+ #: subscribe2.php:109 subscribe2.php:2009 subscribe2.php:2242
122
  msgid "Subscribe2"
123
  msgstr ""
124
 
134
  msgid "Once Weekly"
135
  msgstr ""
136
 
137
+ #: subscribe2.php:687
138
  msgid "New subscriber"
139
  msgstr ""
140
 
141
+ #: subscribe2.php:688
142
  msgid "subscribed to email notifications!"
143
  msgstr ""
144
 
145
+ #: subscribe2.php:1038
146
  msgid "Address(es) subscribed!"
147
  msgstr ""
148
 
149
+ #: subscribe2.php:1041
150
  msgid "deleted!"
151
  msgstr ""
152
 
153
+ #: subscribe2.php:1044
154
  msgid "status changed!"
155
  msgstr ""
156
 
157
+ #: subscribe2.php:1047
158
  msgid "Reminder Email(s) Sent!"
159
  msgstr ""
160
 
161
+ #: subscribe2.php:1050
162
  msgid "CSV File Created in wp-content"
163
  msgstr ""
164
 
165
+ #: subscribe2.php:1053
166
  msgid "Registered Users Subscribed!"
167
  msgstr ""
168
 
169
+ #: subscribe2.php:1056
170
  msgid "Registered Users Unsubscribed!"
171
  msgstr ""
172
 
173
+ #: subscribe2.php:1118
174
  msgid "Subscribe Addresses"
175
  msgstr ""
176
 
177
+ #: subscribe2.php:1123
178
  msgid "Enter addresses, one per line or comma-seperated"
179
  msgstr ""
180
 
181
+ #: subscribe2.php:1132
182
  msgid "Filter"
183
  msgstr ""
184
 
185
+ #: subscribe2.php:1136
186
  msgid ""
187
  "Registered on the left, confirmed in the middle, unconfirmed on the right"
188
  msgstr ""
189
 
190
+ #: subscribe2.php:1145
191
  msgid "Save Emails to CSV File"
192
  msgstr ""
193
 
194
+ #: subscribe2.php:1196
195
  msgid "NONE"
196
  msgstr ""
197
 
198
+ #: subscribe2.php:1206
199
  msgid "Send Reminder Email"
200
  msgstr ""
201
 
202
+ #: subscribe2.php:1213
203
  msgid "Categories"
204
  msgstr ""
205
 
206
+ #: subscribe2.php:1214
207
  msgid ""
208
  "Existing Registered Users can be automatically (un)subscribed to categories "
209
  "using this section."
210
  msgstr ""
211
 
212
+ #: subscribe2.php:1215
213
  msgid "Consider User Privacy as changes cannot be undone"
214
  msgstr ""
215
 
216
+ #: subscribe2.php:1220
217
  msgid "Action to perform"
218
  msgstr ""
219
 
220
+ #: subscribe2.php:1225 subscribe2.php:1488
221
  msgid "Submit"
222
  msgstr ""
223
 
224
+ #: subscribe2.php:1345
225
  msgid "Delivery Options"
226
  msgstr ""
227
 
228
+ #: subscribe2.php:1346
229
  msgid "Send Emails for Pages"
230
  msgstr ""
231
 
232
+ #: subscribe2.php:1351 subscribe2.php:1362 subscribe2.php:1459
233
+ #: subscribe2.php:1609 subscribe2.php:1627
234
  msgid "Yes"
235
  msgstr ""
236
 
237
+ #: subscribe2.php:1356 subscribe2.php:1367 subscribe2.php:1453
238
+ #: subscribe2.php:1464 subscribe2.php:1614 subscribe2.php:1631
239
  msgid "No"
240
  msgstr ""
241
 
242
+ #: subscribe2.php:1357
243
  msgid "Send Emails for Password Protected Posts"
244
  msgstr ""
245
 
246
+ #: subscribe2.php:1368
247
  msgid "Send Email From"
248
  msgstr ""
249
 
250
+ #: subscribe2.php:1373
251
  msgid "Author of the post"
252
  msgstr ""
253
 
254
+ #: subscribe2.php:1378
255
  msgid "Blog Admin"
256
  msgstr ""
257
 
258
+ #: subscribe2.php:1380
259
  msgid "Send Email as Digest"
260
  msgstr ""
261
 
262
+ #: subscribe2.php:1383
263
  msgid "Email Templates"
264
  msgstr ""
265
 
266
+ #: subscribe2.php:1386
267
  msgid "New Post email (must not be empty)"
268
  msgstr ""
269
 
270
+ #: subscribe2.php:1390
271
  msgid "Message substitions"
272
  msgstr ""
273
 
274
+ #: subscribe2.php:1394
275
  msgid "the post's title"
276
  msgstr ""
277
 
278
+ #: subscribe2.php:1395
279
  msgid ""
280
  "the excerpt or the entire post<br />(<i>based on the subscriber's "
281
  "preferences</i>)"
282
  msgstr ""
283
 
284
+ #: subscribe2.php:1396
285
  msgid "a list of post titles (for digest emails)"
286
  msgstr ""
287
 
288
+ #: subscribe2.php:1397
289
  msgid "the post's permalink"
290
  msgstr ""
291
 
292
+ #: subscribe2.php:1398
293
  msgid "the admin or post author's name"
294
  msgstr ""
295
 
296
+ #: subscribe2.php:1399
297
  msgid "the admin or post author's email"
298
  msgstr ""
299
 
300
+ #: subscribe2.php:1400
301
  msgid "the post author's name"
302
  msgstr ""
303
 
304
+ #: subscribe2.php:1401
305
  msgid ""
306
  "the generated link to confirm a request<br />(<i>only used in the "
307
  "confirmation email template</i>)"
308
  msgstr ""
309
 
310
+ #: subscribe2.php:1402
311
  msgid ""
312
  "Action performed by LINK in confirmation email<br />(<i>only used in the "
313
  "confirmation email template</i>)"
314
  msgstr ""
315
 
316
+ #: subscribe2.php:1404
317
  msgid "Subscribe / Unsubscribe confirmation email"
318
  msgstr ""
319
 
320
+ #: subscribe2.php:1407
321
  msgid "Reminder email to Unconfirmed Subscribers"
322
  msgstr ""
323
 
324
+ #: subscribe2.php:1412
325
  msgid "Excluded Categories"
326
  msgstr ""
327
 
328
+ #: subscribe2.php:1413
329
  msgid ""
330
  "Posts assigned to any Excluded Category do not generate notifications and "
331
  "are not included in digest notifications"
332
  msgstr ""
333
 
334
+ #: subscribe2.php:1419
335
  msgid "Allow registered users to subscribe to excluded categories?"
336
  msgstr ""
337
 
338
+ #: subscribe2.php:1422
339
  msgid "Writing Options"
340
  msgstr ""
341
 
342
+ #: subscribe2.php:1427
343
  msgid "Show the Subscribe2 button on the Write toolbar?"
344
  msgstr ""
345
 
346
+ #: subscribe2.php:1434
347
  msgid "Enable Subscribe2 Widget?"
348
  msgstr ""
349
 
350
+ #: subscribe2.php:1437
351
  msgid "Auto Subscribe"
352
  msgstr ""
353
 
354
+ #: subscribe2.php:1438
355
  msgid "Subscribe new users registering with your blog"
356
  msgstr ""
357
 
358
+ #: subscribe2.php:1443
359
  msgid "Automatically"
360
  msgstr ""
361
 
362
+ #: subscribe2.php:1448
363
  msgid "Display option on Registration Form"
364
  msgstr ""
365
 
366
+ #: subscribe2.php:1454
367
  msgid "Registration Form option is checked by default"
368
  msgstr ""
369
 
370
+ #: subscribe2.php:1465
371
  msgid "Auto-subscribe users to receive email as"
372
  msgstr ""
373
 
374
+ #: subscribe2.php:1470 subscribe2.php:1587
375
  msgid "HTML"
376
  msgstr ""
377
 
378
+ #: subscribe2.php:1475
379
  msgid "Plain Text - Full"
380
  msgstr ""
381
 
382
+ #: subscribe2.php:1480
383
  msgid "Plain Text - Excerpt"
384
  msgstr ""
385
 
386
+ #: subscribe2.php:1483
387
  msgid "Barred Domains"
388
  msgstr ""
389
 
390
+ #: subscribe2.php:1484
391
  msgid ""
392
  "Enter domains to bar from public subscriptions: <br /> (Use a new line for "
393
  "each entry and omit the \"@\" symbol, for example email.com)"
394
  msgstr ""
395
 
396
+ #: subscribe2.php:1493
397
  msgid "Reset Default"
398
  msgstr ""
399
 
400
+ #: subscribe2.php:1494
401
  msgid ""
402
  "Use this to reset all options to their defaults. This <strong><em>will not</"
403
  "em></strong> modify your list of subscribers."
404
  msgstr ""
405
 
406
+ #: subscribe2.php:1501
407
  msgid "RESET"
408
  msgstr ""
409
 
410
+ #: subscribe2.php:1521
411
  msgid "Subscription preferences updated."
412
  msgstr ""
413
 
414
+ #: subscribe2.php:1575
415
  msgid "Notification Settings"
416
  msgstr ""
417
 
418
+ #: subscribe2.php:1582
419
  msgid "Receive email as"
420
  msgstr ""
421
 
422
+ #: subscribe2.php:1592
423
  msgid "Plain Text"
424
  msgstr ""
425
 
426
+ #: subscribe2.php:1594
427
  msgid "Email contains"
428
  msgstr ""
429
 
430
+ #: subscribe2.php:1595
431
  msgid "Excerpt Only"
432
  msgstr ""
433
 
434
+ #: subscribe2.php:1595
435
  msgid "Full Post"
436
  msgstr ""
437
 
438
+ #: subscribe2.php:1603
439
+ msgid "Note: HTML format will always deliver the full post"
440
  msgstr ""
441
 
442
+ #: subscribe2.php:1604
443
  msgid "Automatically subscribe me to newly created categories"
444
  msgstr ""
445
 
446
+ #: subscribe2.php:1617
447
  msgid "Subscribed Categories"
448
  msgstr ""
449
 
450
+ #: subscribe2.php:1622
451
  msgid "Receive daily summary of new posts?"
452
  msgstr ""
453
 
454
+ #: subscribe2.php:1635
455
+ msgid "Update Preferences"
456
  msgstr ""
457
 
458
+ #: subscribe2.php:1680
459
  msgid "Send email to all subscribers"
460
  msgstr ""
461
 
462
+ #: subscribe2.php:1685
463
  msgid "Subject"
464
  msgstr ""
465
 
466
+ #: subscribe2.php:1685
467
  msgid "A message from "
468
  msgstr ""
469
 
470
+ #: subscribe2.php:1688
471
  msgid "Recipients: "
472
  msgstr ""
473
 
474
+ #: subscribe2.php:1750
475
  msgid "Select / Unselect All"
476
  msgstr ""
477
 
478
+ #: subscribe2.php:1763
479
  msgid "All Subscribers"
480
  msgstr ""
481
 
482
+ #: subscribe2.php:1764
483
  msgid "Public Subscribers"
484
  msgstr ""
485
 
486
+ #: subscribe2.php:1765
487
  msgid "Confirmed"
488
  msgstr ""
489
 
490
+ #: subscribe2.php:1766
491
  msgid "Unconfirmed"
492
  msgstr ""
493
 
494
+ #: subscribe2.php:1767
495
  msgid "Registered Users"
496
  msgstr ""
497
 
498
+ #: subscribe2.php:1824
499
  msgid "Per Post Email"
500
  msgstr ""
501
 
502
+ #: subscribe2.php:1839
503
+ msgid "Send Digest Notification at"
504
+ msgstr ""
505
+
506
+ #: subscribe2.php:1851
507
+ msgid ""
508
+ "This option will work for digest notification sent daily or less frequently"
509
+ msgstr ""
510
+
511
+ #: subscribe2.php:1853
512
  msgid "Reset the schedule time and date for periodic email notifications"
513
  msgstr ""
514
 
515
+ #: subscribe2.php:1856
516
  msgid "Current server time is"
517
  msgstr ""
518
 
519
+ #: subscribe2.php:1858
520
  msgid "Next email notification will be sent"
521
  msgstr ""
522
 
523
+ #: subscribe2.php:1871
524
  msgid "Check here to Subscribe to email notifications for new posts"
525
  msgstr ""
526
 
527
+ #: subscribe2.php:1880
528
  msgid ""
529
  "By Registering with this blog you are also agreeing to recieve email "
530
  "notifications for new posts"
531
  msgstr ""
532
 
533
+ #: subscribe2.php:1998
534
  msgid "Subscription Confirmation"
535
  msgstr ""
536
 
537
+ #: subscribe2.php:2032
538
  msgid "Title:"
539
  msgstr ""
540
 
541
+ #: subscribe2.php:2138
542
  msgid "Digest Email"
543
  msgstr ""
544
+
545
+ #: include/options.php:55
546
+ msgid ""
547
+ "BLOGNAME has posted a new item, 'TITLE'\n"
548
+ "\n"
549
+ "POST\n"
550
+ "\n"
551
+ "You may view the latest post at\n"
552
+ "PERMALINK\n"
553
+ "\n"
554
+ "You received this e-mail because you asked to be notified when new updates "
555
+ "are posted.\n"
556
+ "Best regards,\n"
557
+ "MYNAME\n"
558
+ "EMAIL"
559
+ msgstr ""
560
+
561
+ #: include/options.php:59
562
+ msgid ""
563
+ "BLOGNAME has received a request to ACTION for this email address. To "
564
+ "complete your request please click on the link below:\n"
565
+ "\n"
566
+ "LINK\n"
567
+ "\n"
568
+ "If you did not request this, please feel free to disregard this notice!\n"
569
+ "\n"
570
+ "Thank you,\n"
571
+ "MYNAME."
572
+ msgstr ""
573
+
574
+ #: include/options.php:63
575
+ msgid ""
576
+ "This email address was subscribed for notifications at BLOGNAME (BLOGLINK) "
577
+ "but the subscription remains incomplete.\n"
578
+ "\n"
579
+ "If you wish to complete your subscription please click on the link below:\n"
580
+ "\n"
581
+ "LINK\n"
582
+ "\n"
583
+ "If you do not wish to complete your subscription please ignore this email "
584
+ "and your address will be removed from our database.\n"
585
+ "\n"
586
+ "Regards,\n"
587
+ "MYNAME"
588
+ msgstr ""
subscribe2/tinymce/editor_plugin.js CHANGED
@@ -71,7 +71,7 @@ var TinyMCE_Subscribe2Quicktags = {
71
  var moreText = content.substring(startPos + 14, endPos - 3);
72
  var contentAfter = content.substring(endPos);
73
  content = content.substring(0, startPos);
74
- content += '<img src="../wp-content/plugins/subscribe2/spacer.gif" ';
75
  content += ' width="210px" height="25px" moretext="'+moreText+'" ';
76
  content += 'alt="'+alt+'" title="'+alt+'" style="'+cssstyle+'" class="mce_plugin_s2_img" />';
77
  content += contentAfter;
71
  var moreText = content.substring(startPos + 14, endPos - 3);
72
  var contentAfter = content.substring(endPos);
73
  content = content.substring(0, startPos);
74
+ content += '<img src="../wp-content/plugins/subscribe2/include/spacer.gif" ';
75
  content += ' width="210px" height="25px" moretext="'+moreText+'" ';
76
  content += 'alt="'+alt+'" title="'+alt+'" style="'+cssstyle+'" class="mce_plugin_s2_img" />';
77
  content += contentAfter;
subscribe2/tinymce/langs/en.js ADDED
@@ -0,0 +1,5 @@
 
 
 
 
 
1
+ // US lang variables
2
+
3
+ tinyMCE.addToLang('subscribe2quicktags',{
4
+ subscribe2 : 'Embed Subscribe2 token'
5
+ });