Version Description
Download this release
Release Info
Developer | MattyRob |
Plugin | Subscribe2 |
Version | 8.1 |
Comparing to | |
See all releases |
Code changes from version 8.0 to 8.1
- ReadMe.txt +7 -1
- admin/your_subscriptions.php +2 -2
- classes/class-s2-admin.php +1 -1
- classes/class-s2-core.php +37 -45
- classes/class-s2_multisite.php +23 -26
- subscribe2.php +4 -2
- subscribe2.pot +21 -17
ReadMe.txt
CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_butt
|
|
4 |
Tags: posts, subscription, email, subscribe, notify, notification
|
5 |
Requires at least: 3.1
|
6 |
Tested up to: 3.3.1
|
7 |
-
Stable tag: 8.
|
8 |
|
9 |
Sends a list of subscribers an email notification when new posts are published to your blog
|
10 |
|
@@ -303,6 +303,12 @@ Secondly, make sure that the token ([subscribe2] or <!--subscribe2-->) is correc
|
|
303 |
|
304 |
== Changelog ==
|
305 |
|
|
|
|
|
|
|
|
|
|
|
|
|
306 |
= Version 8.0 by Matthew Robinson =
|
307 |
|
308 |
* Split the main plugin file into separate classes for more efficient (60% less RAM) server resource usage - huge thanks to Milan Petrovic
|
4 |
Tags: posts, subscription, email, subscribe, notify, notification
|
5 |
Requires at least: 3.1
|
6 |
Tested up to: 3.3.1
|
7 |
+
Stable tag: 8.1
|
8 |
|
9 |
Sends a list of subscribers an email notification when new posts are published to your blog
|
10 |
|
303 |
|
304 |
== Changelog ==
|
305 |
|
306 |
+
= Version 8.1 by Matthew Robinson =
|
307 |
+
|
308 |
+
* Fixed redirect errors and crash affecting multisite installs on upgrade to 8.0 - thanks in particular to Ed Cooper
|
309 |
+
* Fixed several other multisite bugs affecting links and styling - thanks to Mark Olbert
|
310 |
+
* Fixed empty CSV exports - thanks to Gil Namur
|
311 |
+
|
312 |
= Version 8.0 by Matthew Robinson =
|
313 |
|
314 |
* Split the main plugin file into separate classes for more efficient (60% less RAM) server resource usage - huge thanks to Milan Petrovic
|
admin/your_subscriptions.php
CHANGED
@@ -177,7 +177,7 @@ echo "</form>\r\n";
|
|
177 |
|
178 |
// list of subscribed blogs on wordpress mu
|
179 |
if ( $this->s2_mu && !isset($_GET['email']) ) {
|
180 |
-
global $blog_id, $current_user;
|
181 |
$s2blog_id = $blog_id;
|
182 |
get_currentuserinfo();
|
183 |
$blogs = $s2class_multisite->get_mu_blog_list();
|
@@ -209,7 +209,7 @@ if ( $this->s2_mu && !isset($_GET['email']) ) {
|
|
209 |
}
|
210 |
$blog['description'] = get_option('blogdescription');
|
211 |
$blog['blogurl'] = get_option('home');
|
212 |
-
$blog['subscribe_page'] = get_option('home') . "/wp-admin/
|
213 |
|
214 |
$key = strtolower($blog['blogname'] . "-" . $blog['blog_id']);
|
215 |
if ( !empty($subscribed) ) {
|
177 |
|
178 |
// list of subscribed blogs on wordpress mu
|
179 |
if ( $this->s2_mu && !isset($_GET['email']) ) {
|
180 |
+
global $blog_id, $current_user, $s2class_multisite;
|
181 |
$s2blog_id = $blog_id;
|
182 |
get_currentuserinfo();
|
183 |
$blogs = $s2class_multisite->get_mu_blog_list();
|
209 |
}
|
210 |
$blog['description'] = get_option('blogdescription');
|
211 |
$blog['blogurl'] = get_option('home');
|
212 |
+
$blog['subscribe_page'] = get_option('home') . "/wp-admin/admin.php?page=s2";
|
213 |
|
214 |
$key = strtolower($blog['blogname'] . "-" . $blog['blog_id']);
|
215 |
if ( !empty($subscribed) ) {
|
classes/class-s2-admin.php
CHANGED
@@ -41,7 +41,7 @@ class s2_admin extends s2class {
|
|
41 |
|
42 |
function user_admin_css() {
|
43 |
wp_register_style('s2_user_admin', S2URL . 'include/s2_user_admin.css', array(), '1.0');
|
44 |
-
|
45 |
} // end user_admin_css()
|
46 |
|
47 |
function option_form_js() {
|
41 |
|
42 |
function user_admin_css() {
|
43 |
wp_register_style('s2_user_admin', S2URL . 'include/s2_user_admin.css', array(), '1.0');
|
44 |
+
wp_enqueue_style('s2_user_admin');
|
45 |
} // end user_admin_css()
|
46 |
|
47 |
function option_form_js() {
|
classes/class-s2-core.php
CHANGED
@@ -159,6 +159,7 @@ class s2class {
|
|
159 |
|
160 |
// upgrade old wpmu user meta data to new
|
161 |
if ( $this->s2_mu === true ) {
|
|
|
162 |
$s2class_multisite->namechange_subscribe2_widget();
|
163 |
// loop through all users
|
164 |
foreach ( $users as $user_ID ) {
|
@@ -1170,28 +1171,11 @@ class s2class {
|
|
1170 |
/**
|
1171 |
Export subscriber emails and other details to CSV
|
1172 |
*/
|
1173 |
-
function prepare_export( $
|
1174 |
-
$
|
1175 |
-
$unconfirmed = $this->get_public(0);
|
1176 |
-
if ( 'all' == $what ) {
|
1177 |
-
$subscribers = array_merge((array)$confirmed, (array)$unconfirmed, (array)$this->get_all_registered());
|
1178 |
-
} elseif ( 'public' == $what ) {
|
1179 |
-
$subscribers = array_merge((array)$confirmed, (array)$unconfirmed);
|
1180 |
-
} elseif ( 'confirmed' == $what ) {
|
1181 |
-
$subscribers = $confirmed;
|
1182 |
-
} elseif ( 'unconfirmed' == $what ) {
|
1183 |
-
$subscribers = $unconfirmed;
|
1184 |
-
} elseif ( is_numeric($what) ) {
|
1185 |
-
$subscribers = $this->get_registered("cats=$what");
|
1186 |
-
} elseif ( 'registered' == $what ) {
|
1187 |
-
$subscribers = $this->get_registered();
|
1188 |
-
} elseif ( 'all_users' == $what ) {
|
1189 |
-
$subscribers = $this->get_all_registered();
|
1190 |
-
}
|
1191 |
-
|
1192 |
natcasesort($subscribers);
|
1193 |
|
1194 |
-
$exportcsv = "User Email,User Name";
|
1195 |
$all_cats = $this->all_cats(false, 'ID');
|
1196 |
|
1197 |
foreach ($all_cats as $cat) {
|
@@ -1200,24 +1184,29 @@ class s2class {
|
|
1200 |
}
|
1201 |
$exportcsv .= "\r\n";
|
1202 |
|
|
|
|
|
|
|
|
|
1203 |
foreach ( $subscribers as $subscriber ) {
|
1204 |
if ( $this->is_registered($subscriber) ) {
|
1205 |
$user_ID = $this->get_user_id( $subscriber );
|
1206 |
-
$user_info = get_userdata($user_ID);
|
1207 |
|
1208 |
-
$cats = explode(',', get_user_meta($
|
1209 |
$subscribed_cats = '';
|
1210 |
foreach ( $cat_ids as $cat ) {
|
1211 |
(in_array($cat, $cats)) ? $subscribed_cats .= ",Yes" : $subscribed_cats .= ",No";
|
1212 |
}
|
1213 |
|
1214 |
-
$exportcsv .= $
|
1215 |
-
$exportcsv .=
|
|
|
1216 |
$exportcsv .= $subscribed_cats . "\r\n";
|
1217 |
} else {
|
1218 |
-
if (
|
1219 |
$exportcsv .= $subscriber . ',' . __('Confirmed Public Subscriber', 'subscribe2') . "\r\n";
|
1220 |
-
} elseif (
|
1221 |
$exportcsv .= $subscriber . ',' . __('Unconfirmed Public Subscriber', 'subscribe2') . "\r\n";
|
1222 |
}
|
1223 |
}
|
@@ -1620,6 +1609,28 @@ class s2class {
|
|
1620 |
|
1621 |
load_plugin_textdomain('subscribe2', false, S2DIR);
|
1622 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1623 |
// do we need to install anything?
|
1624 |
$this->public = $table_prefix . "subscribe2";
|
1625 |
if ( $wpdb->get_var("SHOW TABLES LIKE '{$this->public}'") != $this->public ) { $this->install(); }
|
@@ -1744,25 +1755,6 @@ class s2class {
|
|
1744 |
add_action('wp_head', array(&$this, 'add_s2_ajax'));
|
1745 |
}
|
1746 |
}
|
1747 |
-
|
1748 |
-
// load our strings
|
1749 |
-
$this->load_strings();
|
1750 |
-
|
1751 |
-
// Is this WordPressMU or not?
|
1752 |
-
$this->s2_mu = false;
|
1753 |
-
if ( isset($wpmu_version) || strpos($wp_version, 'wordpress-mu') ) {
|
1754 |
-
$this->s2_mu = true;
|
1755 |
-
}
|
1756 |
-
if ( function_exists('is_multisite') && is_multisite() ) {
|
1757 |
-
$this->s2_mu = true;
|
1758 |
-
}
|
1759 |
-
|
1760 |
-
// add action to handle WPMU subscriptions and unsubscriptions
|
1761 |
-
if ( $this->s2_mu === true || isset($_GET['s2mu_subscribe']) || isset($_GET['s2mu_unsubscribe']) ) {
|
1762 |
-
require_once(S2PATH . "classes/class-s2_multisite.php");
|
1763 |
-
$s2class_multisite = new s2_multisite;
|
1764 |
-
add_action('init', array(&$s2class_multisite, 'wpmu_subscribe'));
|
1765 |
-
}
|
1766 |
} // end s2init()
|
1767 |
|
1768 |
/* ===== our variables ===== */
|
159 |
|
160 |
// upgrade old wpmu user meta data to new
|
161 |
if ( $this->s2_mu === true ) {
|
162 |
+
global $s2class_multisite;
|
163 |
$s2class_multisite->namechange_subscribe2_widget();
|
164 |
// loop through all users
|
165 |
foreach ( $users as $user_ID ) {
|
1171 |
/**
|
1172 |
Export subscriber emails and other details to CSV
|
1173 |
*/
|
1174 |
+
function prepare_export( $subscribers ) {
|
1175 |
+
$subscribers = explode(",\r\n", $subscribers);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1176 |
natcasesort($subscribers);
|
1177 |
|
1178 |
+
$exportcsv = "User Email,User Type,User Name";
|
1179 |
$all_cats = $this->all_cats(false, 'ID');
|
1180 |
|
1181 |
foreach ($all_cats as $cat) {
|
1184 |
}
|
1185 |
$exportcsv .= "\r\n";
|
1186 |
|
1187 |
+
if ( !function_exists('get_userdata') ) {
|
1188 |
+
require_once(ABSPATH . WPINC . '/pluggable.php');
|
1189 |
+
}
|
1190 |
+
|
1191 |
foreach ( $subscribers as $subscriber ) {
|
1192 |
if ( $this->is_registered($subscriber) ) {
|
1193 |
$user_ID = $this->get_user_id( $subscriber );
|
1194 |
+
$user_info = get_userdata( $user_ID );
|
1195 |
|
1196 |
+
$cats = explode(',', get_user_meta($user_ID, $this->get_usermeta_keyname('s2_subscribed'), true));
|
1197 |
$subscribed_cats = '';
|
1198 |
foreach ( $cat_ids as $cat ) {
|
1199 |
(in_array($cat, $cats)) ? $subscribed_cats .= ",Yes" : $subscribed_cats .= ",No";
|
1200 |
}
|
1201 |
|
1202 |
+
$exportcsv .= $subscriber . ',';
|
1203 |
+
$exportcsv .= __('Registered User', 'subscribe2');
|
1204 |
+
$exportcsv .= ',' . $user_info->display_name;
|
1205 |
$exportcsv .= $subscribed_cats . "\r\n";
|
1206 |
} else {
|
1207 |
+
if ( $this->is_public($subscriber) === '1' ) {
|
1208 |
$exportcsv .= $subscriber . ',' . __('Confirmed Public Subscriber', 'subscribe2') . "\r\n";
|
1209 |
+
} elseif ( $this->is_public($subscriber) === '0' ) {
|
1210 |
$exportcsv .= $subscriber . ',' . __('Unconfirmed Public Subscriber', 'subscribe2') . "\r\n";
|
1211 |
}
|
1212 |
}
|
1609 |
|
1610 |
load_plugin_textdomain('subscribe2', false, S2DIR);
|
1611 |
|
1612 |
+
// load our strings
|
1613 |
+
$this->load_strings();
|
1614 |
+
|
1615 |
+
// Is this WordPressMU or not?
|
1616 |
+
$this->s2_mu = false;
|
1617 |
+
if ( isset($wpmu_version) || strpos($wp_version, 'wordpress-mu') ) {
|
1618 |
+
$this->s2_mu = true;
|
1619 |
+
}
|
1620 |
+
if ( function_exists('is_multisite') && is_multisite() ) {
|
1621 |
+
$this->s2_mu = true;
|
1622 |
+
}
|
1623 |
+
|
1624 |
+
// add action to handle WPMU subscriptions and unsubscriptions
|
1625 |
+
if ( $this->s2_mu === true ) {
|
1626 |
+
require_once(S2PATH . "classes/class-s2_multisite.php");
|
1627 |
+
global $s2class_multisite;
|
1628 |
+
$s2class_multisite = new s2_multisite;
|
1629 |
+
if ( isset($_GET['s2mu_subscribe']) || isset($_GET['s2mu_unsubscribe']) ) {
|
1630 |
+
add_action('init', array(&$this, 'wpmu_subscribe'));
|
1631 |
+
}
|
1632 |
+
}
|
1633 |
+
|
1634 |
// do we need to install anything?
|
1635 |
$this->public = $table_prefix . "subscribe2";
|
1636 |
if ( $wpdb->get_var("SHOW TABLES LIKE '{$this->public}'") != $this->public ) { $this->install(); }
|
1755 |
add_action('wp_head', array(&$this, 'add_s2_ajax'));
|
1756 |
}
|
1757 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1758 |
} // end s2init()
|
1759 |
|
1760 |
/* ===== our variables ===== */
|
classes/class-s2_multisite.php
CHANGED
@@ -5,6 +5,7 @@ class s2_multisite {
|
|
5 |
Handles subscriptions and unsubscriptions for different blogs on WPMU installs
|
6 |
*/
|
7 |
function wpmu_subscribe() {
|
|
|
8 |
// subscribe to new blog
|
9 |
if ( !empty($_GET['s2mu_subscribe']) ) {
|
10 |
$sub_id = intval($_GET['s2mu_subscribe']);
|
@@ -22,21 +23,21 @@ class s2_multisite {
|
|
22 |
}
|
23 |
|
24 |
// get categories, remove excluded ones if override is off
|
25 |
-
if ( 0 == $
|
26 |
-
$all_cats = $
|
27 |
} else {
|
28 |
-
$all_cats = $
|
29 |
}
|
30 |
|
31 |
$cats_string = '';
|
32 |
foreach ( $all_cats as $cat ) {
|
33 |
('' == $cats_string) ? $cats_string = "$cat->term_id" : $cats_string .= ",$cat->term_id";
|
34 |
-
update_user_meta($user_ID, $
|
35 |
}
|
36 |
if ( empty($cats_string) ) {
|
37 |
-
delete_user_meta($user_ID, $
|
38 |
} else {
|
39 |
-
update_user_meta($user_ID, $
|
40 |
}
|
41 |
}
|
42 |
} elseif ( !empty($_GET['s2mu_unsubscribe']) ) {
|
@@ -48,16 +49,16 @@ class s2_multisite {
|
|
48 |
$user_ID = get_current_user_id();
|
49 |
|
50 |
// delete subscription to all categories on that blog
|
51 |
-
$cats = get_user_meta($user_ID, $
|
52 |
$cats = explode(',', $cats);
|
53 |
if ( !is_array($cats) ) {
|
54 |
$cats = array($cats);
|
55 |
}
|
56 |
|
57 |
foreach ( $cats as $id ) {
|
58 |
-
delete_user_meta($user_ID, $
|
59 |
}
|
60 |
-
delete_user_meta($user_ID, $
|
61 |
|
62 |
// add an action hook for external manipulation of blog and user data
|
63 |
do_action_ref_array('subscribe2_wpmu_unsubscribe', array($user_ID, $unsub_id));
|
@@ -78,15 +79,9 @@ class s2_multisite {
|
|
78 |
}
|
79 |
|
80 |
// redirect to profile page
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
exit(0);
|
85 |
-
} else {
|
86 |
-
$url = get_option('siteurl') . '/wp-admin/profile.php?page=s2_users';
|
87 |
-
wp_redirect($url);
|
88 |
-
exit(0);
|
89 |
-
}
|
90 |
} // end wpmu_subscribe()
|
91 |
|
92 |
/**
|
@@ -113,11 +108,12 @@ class s2_multisite {
|
|
113 |
Register user details when new user is added to a multisite blog
|
114 |
*/
|
115 |
function wpmu_add_user($user_ID = 0) {
|
|
|
116 |
if ( 0 == $user_ID ) { return; }
|
117 |
-
if ( 'yes' == $
|
118 |
-
$
|
119 |
} else {
|
120 |
-
$
|
121 |
}
|
122 |
} // end wpmu_add_user()
|
123 |
|
@@ -125,17 +121,18 @@ class s2_multisite {
|
|
125 |
Delete user details when a user is removed from a multisite blog
|
126 |
*/
|
127 |
function wpmu_remove_user($user_ID) {
|
|
|
128 |
if ( 0 == $user_ID ) { return; }
|
129 |
-
delete_user_meta($user_ID, $
|
130 |
-
delete_user_meta($user_ID, $
|
131 |
-
$cats = get_user_meta($user_ID, $
|
132 |
if ( !empty($cats) ) {
|
133 |
$cats = explode(',', $cats);
|
134 |
foreach ( $cats as $cat ) {
|
135 |
-
delete_user_meta($user_ID, $
|
136 |
}
|
137 |
}
|
138 |
-
delete_user_meta($user_ID, $
|
139 |
} // end wpmu_remove_user()
|
140 |
|
141 |
/**
|
5 |
Handles subscriptions and unsubscriptions for different blogs on WPMU installs
|
6 |
*/
|
7 |
function wpmu_subscribe() {
|
8 |
+
global $mysubscribe2;
|
9 |
// subscribe to new blog
|
10 |
if ( !empty($_GET['s2mu_subscribe']) ) {
|
11 |
$sub_id = intval($_GET['s2mu_subscribe']);
|
23 |
}
|
24 |
|
25 |
// get categories, remove excluded ones if override is off
|
26 |
+
if ( 0 == $mysubscribe2->subscribe2_options['reg_override'] ) {
|
27 |
+
$all_cats = $mysubscribe2->all_cats(true, 'ID');
|
28 |
} else {
|
29 |
+
$all_cats = $mysubscribe2->all_cats(false, 'ID');
|
30 |
}
|
31 |
|
32 |
$cats_string = '';
|
33 |
foreach ( $all_cats as $cat ) {
|
34 |
('' == $cats_string) ? $cats_string = "$cat->term_id" : $cats_string .= ",$cat->term_id";
|
35 |
+
update_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_cat') . $cat->term_id, $cat->term_id);
|
36 |
}
|
37 |
if ( empty($cats_string) ) {
|
38 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'));
|
39 |
} else {
|
40 |
+
update_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'), $cats_string);
|
41 |
}
|
42 |
}
|
43 |
} elseif ( !empty($_GET['s2mu_unsubscribe']) ) {
|
49 |
$user_ID = get_current_user_id();
|
50 |
|
51 |
// delete subscription to all categories on that blog
|
52 |
+
$cats = get_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'), true);
|
53 |
$cats = explode(',', $cats);
|
54 |
if ( !is_array($cats) ) {
|
55 |
$cats = array($cats);
|
56 |
}
|
57 |
|
58 |
foreach ( $cats as $id ) {
|
59 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_cat') . $id);
|
60 |
}
|
61 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'));
|
62 |
|
63 |
// add an action hook for external manipulation of blog and user data
|
64 |
do_action_ref_array('subscribe2_wpmu_unsubscribe', array($user_ID, $unsub_id));
|
79 |
}
|
80 |
|
81 |
// redirect to profile page
|
82 |
+
$url = get_option('siteurl') . '/wp-admin/admin.php?page=s2';
|
83 |
+
wp_redirect($url);
|
84 |
+
exit(0);
|
|
|
|
|
|
|
|
|
|
|
|
|
85 |
} // end wpmu_subscribe()
|
86 |
|
87 |
/**
|
108 |
Register user details when new user is added to a multisite blog
|
109 |
*/
|
110 |
function wpmu_add_user($user_ID = 0) {
|
111 |
+
global $mysubscribe2;
|
112 |
if ( 0 == $user_ID ) { return; }
|
113 |
+
if ( 'yes' == $mysubscribe2->subscribe2_options['autosub'] ) {
|
114 |
+
$mysubscribe2->register($user_ID, true);
|
115 |
} else {
|
116 |
+
$mysubscribe2->register($user_ID, false);
|
117 |
}
|
118 |
} // end wpmu_add_user()
|
119 |
|
121 |
Delete user details when a user is removed from a multisite blog
|
122 |
*/
|
123 |
function wpmu_remove_user($user_ID) {
|
124 |
+
global $mysubscribe2;
|
125 |
if ( 0 == $user_ID ) { return; }
|
126 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_format'));
|
127 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_autosub'));
|
128 |
+
$cats = get_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'), true);
|
129 |
if ( !empty($cats) ) {
|
130 |
$cats = explode(',', $cats);
|
131 |
foreach ( $cats as $cat ) {
|
132 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_cat') . $cat);
|
133 |
}
|
134 |
}
|
135 |
+
delete_user_meta($user_ID, $mysubscribe2->get_usermeta_keyname('s2_subscribed'));
|
136 |
} // end wpmu_remove_user()
|
137 |
|
138 |
/**
|
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: 8.
|
7 |
Author: Matthew Robinson
|
8 |
Author URI: http://subscribe2.wordpress.com
|
9 |
Licence: GPL3
|
@@ -43,7 +43,7 @@ if ( version_compare($GLOBALS['wp_version'], '3.1', '<') || !function_exists( 'a
|
|
43 |
|
44 |
// our version number. Don't touch this or any line below
|
45 |
// unless you know exactly what you are doing
|
46 |
-
define( 'S2VERSION', '8.
|
47 |
define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
|
48 |
define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
|
49 |
define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
|
@@ -57,10 +57,12 @@ if ( !in_array(ini_get('safe_mode'), $safe_mode) && ini_get('max_execution_time'
|
|
57 |
require_once(S2PATH . 'classes/class-s2-core.php');
|
58 |
if ( is_admin() ) {
|
59 |
require_once(S2PATH . 'classes/class-s2-admin.php');
|
|
|
60 |
$mysubscribe2 = new s2_admin;
|
61 |
$mysubscribe2->s2init();
|
62 |
} else {
|
63 |
require_once(S2PATH . 'classes/class-s2-frontend.php');
|
|
|
64 |
$mysubscribe2 = new s2_frontend;
|
65 |
$mysubscribe2->s2init();
|
66 |
}
|
3 |
Plugin Name: Subscribe2
|
4 |
Plugin URI: http://subscribe2.wordpress.com
|
5 |
Description: Notifies an email list when new entries are posted.
|
6 |
+
Version: 8.1
|
7 |
Author: Matthew Robinson
|
8 |
Author URI: http://subscribe2.wordpress.com
|
9 |
Licence: GPL3
|
43 |
|
44 |
// our version number. Don't touch this or any line below
|
45 |
// unless you know exactly what you are doing
|
46 |
+
define( 'S2VERSION', '8.1' );
|
47 |
define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
|
48 |
define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
|
49 |
define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
|
57 |
require_once(S2PATH . 'classes/class-s2-core.php');
|
58 |
if ( is_admin() ) {
|
59 |
require_once(S2PATH . 'classes/class-s2-admin.php');
|
60 |
+
global $mysubscribe2;
|
61 |
$mysubscribe2 = new s2_admin;
|
62 |
$mysubscribe2->s2init();
|
63 |
} else {
|
64 |
require_once(S2PATH . 'classes/class-s2-frontend.php');
|
65 |
+
global $mysubscribe2;
|
66 |
$mysubscribe2 = new s2_frontend;
|
67 |
$mysubscribe2->s2init();
|
68 |
}
|
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: 2012-
|
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"
|
@@ -899,69 +899,73 @@ msgstr ""
|
|
899 |
msgid "Options reset!"
|
900 |
msgstr ""
|
901 |
|
902 |
-
#: classes/class-s2-core.php:
|
903 |
msgid "Plain Text Excerpt Preview"
|
904 |
msgstr ""
|
905 |
|
906 |
-
#: classes/class-s2-core.php:
|
907 |
msgid "Plain Text Full Preview"
|
908 |
msgstr ""
|
909 |
|
910 |
-
#: classes/class-s2-core.php:
|
911 |
msgid "HTML Excerpt Preview"
|
912 |
msgstr ""
|
913 |
|
914 |
-
#: classes/class-s2-core.php:
|
915 |
msgid "HTML Full Preview"
|
916 |
msgstr ""
|
917 |
|
918 |
-
#: classes/class-s2-core.php:
|
|
|
|
|
|
|
|
|
919 |
msgid "Confirmed Public Subscriber"
|
920 |
msgstr ""
|
921 |
|
922 |
-
#: classes/class-s2-core.php:
|
923 |
msgid "Unconfirmed Public Subscriber"
|
924 |
msgstr ""
|
925 |
|
926 |
-
#: classes/class-s2-core.php:
|
927 |
msgid "Check here to Subscribe to email notifications for new posts"
|
928 |
msgstr ""
|
929 |
|
930 |
-
#: classes/class-s2-core.php:
|
931 |
msgid ""
|
932 |
"By registering with this blog you are also agreeing to receive email "
|
933 |
"notifications for new posts but you can unsubscribe at anytime"
|
934 |
msgstr ""
|
935 |
|
936 |
-
#: classes/class-s2-core.php:
|
937 |
msgid "Check here to Subscribe to notifications for new posts"
|
938 |
msgstr ""
|
939 |
|
940 |
-
#: classes/class-s2-core.php:
|
941 |
msgid "Weekly"
|
942 |
msgstr ""
|
943 |
|
944 |
-
#: classes/class-s2-core.php:
|
945 |
msgid "Author"
|
946 |
msgstr ""
|
947 |
|
948 |
-
#: classes/class-s2-core.php:
|
949 |
msgid "Posted on"
|
950 |
msgstr ""
|
951 |
|
952 |
-
#: classes/class-s2-core.php:
|
953 |
msgid "Posted in"
|
954 |
msgstr ""
|
955 |
|
956 |
-
#: classes/class-s2-core.php:
|
957 |
msgid "Tagged as"
|
958 |
msgstr ""
|
959 |
|
960 |
-
#: classes/class-s2-core.php:
|
961 |
msgid "Digest Email"
|
962 |
msgstr ""
|
963 |
|
964 |
-
#: classes/class-s2-core.php:
|
965 |
msgid "Digest Preview"
|
966 |
msgstr ""
|
967 |
|
8 |
msgstr ""
|
9 |
"Project-Id-Version: PACKAGE VERSION\n"
|
10 |
"Report-Msgid-Bugs-To: \n"
|
11 |
+
"POT-Creation-Date: 2012-04-11 19:11+0100\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"
|
899 |
msgid "Options reset!"
|
900 |
msgstr ""
|
901 |
|
902 |
+
#: classes/class-s2-core.php:618
|
903 |
msgid "Plain Text Excerpt Preview"
|
904 |
msgstr ""
|
905 |
|
906 |
+
#: classes/class-s2-core.php:620
|
907 |
msgid "Plain Text Full Preview"
|
908 |
msgstr ""
|
909 |
|
910 |
+
#: classes/class-s2-core.php:622
|
911 |
msgid "HTML Excerpt Preview"
|
912 |
msgstr ""
|
913 |
|
914 |
+
#: classes/class-s2-core.php:624
|
915 |
msgid "HTML Full Preview"
|
916 |
msgstr ""
|
917 |
|
918 |
+
#: classes/class-s2-core.php:1203
|
919 |
+
msgid "Registered User"
|
920 |
+
msgstr ""
|
921 |
+
|
922 |
+
#: classes/class-s2-core.php:1208
|
923 |
msgid "Confirmed Public Subscriber"
|
924 |
msgstr ""
|
925 |
|
926 |
+
#: classes/class-s2-core.php:1210
|
927 |
msgid "Unconfirmed Public Subscriber"
|
928 |
msgstr ""
|
929 |
|
930 |
+
#: classes/class-s2-core.php:1247
|
931 |
msgid "Check here to Subscribe to email notifications for new posts"
|
932 |
msgstr ""
|
933 |
|
934 |
+
#: classes/class-s2-core.php:1253
|
935 |
msgid ""
|
936 |
"By registering with this blog you are also agreeing to receive email "
|
937 |
"notifications for new posts but you can unsubscribe at anytime"
|
938 |
msgstr ""
|
939 |
|
940 |
+
#: classes/class-s2-core.php:1279
|
941 |
msgid "Check here to Subscribe to notifications for new posts"
|
942 |
msgstr ""
|
943 |
|
944 |
+
#: classes/class-s2-core.php:1369
|
945 |
msgid "Weekly"
|
946 |
msgstr ""
|
947 |
|
948 |
+
#: classes/class-s2-core.php:1490 classes/class-s2-core.php:1491
|
949 |
msgid "Author"
|
950 |
msgstr ""
|
951 |
|
952 |
+
#: classes/class-s2-core.php:1499
|
953 |
msgid "Posted on"
|
954 |
msgstr ""
|
955 |
|
956 |
+
#: classes/class-s2-core.php:1503 classes/class-s2-core.php:1504
|
957 |
msgid "Posted in"
|
958 |
msgstr ""
|
959 |
|
960 |
+
#: classes/class-s2-core.php:1509 classes/class-s2-core.php:1510
|
961 |
msgid "Tagged as"
|
962 |
msgstr ""
|
963 |
|
964 |
+
#: classes/class-s2-core.php:1574
|
965 |
msgid "Digest Email"
|
966 |
msgstr ""
|
967 |
|
968 |
+
#: classes/class-s2-core.php:1584
|
969 |
msgid "Digest Preview"
|
970 |
msgstr ""
|
971 |
|