Changeset 657422

Timestamp:

01/23/2013 03:08:54 PM (13 years ago)

Author:

kzaron

Message:

Update to version 1.5!

Location:

network-mass-email

Files:

• assets/banner-772x250.png (modified) (previous)
• tags/1.5 (added)
• tags/1.5/icon.png (added)
• tags/1.5/network-mass-email.php (added)
• tags/1.5/readme.txt (added)
• tags/1.5/screenshot-1.png (added)
• tags/1.5/templates.php (added)
• trunk/icon.png (added)
• trunk/network-mass-email.php (modified) (12 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/templates.php (added)

network-mass-email/trunk/network-mass-email.php

@@ -4 +4 @@
  Plugin URI: http://wordpress.org/extend/plugins/network-mass-email/
  Description: Allows network admins to send a manually created notification email to all registered users based on user role.
- Version: 1.4.2
+ Version: 1.5
  Author: Kenny Zaron
  Author URI: http://www.kennyzaron.com/
@@ -25 +25 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+// Mail Icon(s) courtesy of: http://www.iconhot.com/icon/android-style-icons-r1/mail-64.html
 
 //error variables
@@ -32 +34 @@
 $nmenoemailserror = false;
 $nmenoroleserror = false;
+$nmeloadtemplateserr = false;
+$message = "";
+$subject = "";
 
 // Determines on pageload whether to load the compose email function or the send email function
@@ -38 +43 @@
     // Run some checks on the submitted form; if everything is OK, send our message
     elseif (isset($_POST['submitsendemail'])) { nme_error_checker(); }
-    else { nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror); }
+    elseif (isset($_POST['loadtemplate'])) {        
+        global $wpdb;
+        $table_name = $wpdb->prefix . "networkmassemail";   
+        //see if template name exists in wpdb   
+        if ( $_POST['selecttemplate'] == "" ) {
+            // it was blank, just load the page
+            nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror, $nmeloadtemplateserr, $subject, $message);
+        }
+        else if ($wpdb->get_var("SELECT name FROM {$table_name} WHERE name='{$_POST['selecttemplate']}'") == $_POST['selecttemplate']) {        
+            //select template row from db           
+            $templateresult = $wpdb->get_row("SELECT * FROM $table_name WHERE name='" . $_POST['selecttemplate'] . "'");            
+            $subject = $templateresult->subject;
+            $message = $templateresult->message;                            
+        }
+        else {
+            $nmeloadtemplateserr = true;            
+        }
+        // check if the list was already loaded
+        
+        
+        nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror, $nmeloadtemplateserr, $subject, $message);
+    }
+    else { nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror, $nmeloadtemplateserr, $subject, $message); }
 }
 
@@ -54 +81 @@
     if( ($_POST['emaillist'] == "") && (isset($_POST['submitsendemail'])) ) { $nmenoemailserror = true; }
     if (isset($_POST['submitsendemail']) && $nmewassuberror == false && $nmewasmsgerror == false && $nmewasfromerror == false && $nmenoemailserror == false) { nme_sendmail(); }
-    else { nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror); }
+    else { nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror, $nmeloadtemplateserr, $subject, $message); }
     }
 }
@@ -60 +87 @@
 //page header function
 function nme_pageheader() {
-        screen_icon();
+        screen_icon('users');
         ?><h2>Network Mass Email</h2><?php
 }
@@ -66 +93 @@
 //sends the messages to the users selected after form is submitted
 function nme_sendmail() {
-        $subject = $_POST['emailsubject'];
+        $subject = stripslashes(html_entity_decode($_POST['emailsubject'], ENT_NOQUOTES, 'UTF-8'));
         $body = stripslashes(html_entity_decode($_POST['emailmessage'], ENT_NOQUOTES, 'UTF-8'));
         $from = $_POST['emailfrom']; 
@@ -104 +131 @@
 // Adds the submenu page under users in network admin
 function nme_add_menu() {
-    add_submenu_page( 'users.php', 'Network Mass Email', 'Mass Email', 'manage_network', 'nme_menupage', 'nme_decider' );
-}
+    // reference: add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $position ); http://codex.wordpress.org/Function_Reference/add_menu_page
+    add_menu_page( 'Network Mass Email', 'Mass Email', 'manage_network', 'nme_menupage', 'nme_decider', plugins_url('network-mass-email/icon.png'), 99 );
+    add_submenu_page( 'nme_menupage', 'Network Mass Email', 'Send Email', 'manage_network', 'nme_menupage', 'nme_decider' );
+}
+
+define( 'NETWORKMASSEMAIL_PATH', plugin_dir_path(__FILE__) );
+require NETWORKMASSEMAIL_PATH .'/templates.php';
 
 // Displays error messages
@@ -113 +145 @@
 
 // Creates the part of the page where users compose their email
-function nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror) {
+function nme_menu_page($nmewassuberror, $nmewasmsgerror, $nmewasfromerror, $nmenoemailserror, $nmenoroleserror, $nmeloadtemplateserr, $subject, $message) {
     nme_pageheader(); 
+    nme_install();
     if($nmewasfromerror == true) { $nmeerrmessage = "ERROR: Your from email address cannot be blank."; nme_error_msg($nmeerrmessage); }
     if($nmewassuberror == true) { $nmeerrmessage = "ERROR: Your subject cannot be blank."; nme_error_msg($nmeerrmessage); }
     if($nmewasmsgerror == true) { $nmeerrmessage = "ERROR: Your message body cannot be blank."; nme_error_msg($nmeerrmessage); }
+    if($nmeloadtemplateserr == true) { $nmeerrmessage = "ERROR: Could not load template."; nme_error_msg($nmeerrmessage); }
     if($nmenoroleserror == true && isset($_POST['listbuttonsubmit'])) { $nmeerrmessage = "ERROR: You need to select at least one group of users in order to load the list."; nme_error_msg($nmeerrmessage); }
     if($nmenoemailserror == true && isset($_POST['submitsendemail'])) { $nmeerrmessage = "ERROR: You need to load users before sending an email."; nme_error_msg($nmeerrmessage); }
-    if ($nmewassuberror == false && $nmewasmsgerror == false && $nmewasfromerror == false && $nmenoemailserror == false && $nmenoroleserror == false) { echo "<br />"; }
-    ?>
+    if ($nmewassuberror == false && $nmewasmsgerror == false && $nmewasfromerror == false && $nmenoemailserror == false && $nmenoroleserror == false) { echo "<br />"; }    ?>
     <h2>Audience</h2>
     <p>Select the user levels you wish to send this message to:</p>
     <form name="massemailform" action="" method="post">
-    <input type="checkbox" name="allincsubs" <?php if($_POST['allincsubs']) echo 'checked="checked"'; else echo ""; ?> onclick="selectAllIncSubs(this);"/> All Users<br />
-    <input type="checkbox" name="allbutsubs" <?php if($_POST['allbutsubs']) echo 'checked="checked"'; else echo ""; ?> onclick="selectAllButSubs(this);"/> All Users EXCEPT Subscribers<br />
-    <input type="checkbox" name="admins" id="admins" <?php if($_POST['admins']) echo 'checked="checked"'; else echo ""; ?> /> Administrators  &nbsp;
-    <input type="checkbox" name="editors" id="editors" <?php if($_POST['editors']) echo 'checked="checked"'; else echo ""; ?> /> Editors &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    <input type="checkbox" name="authors" id="authors" <?php if($_POST['authors']) echo 'checked="checked"'; else echo ""; ?> /> Authors<br />
-    <input type="checkbox" name="contributors" id="contributors" <?php if($_POST['contributors']) echo 'checked="checked"'; else echo ""; ?> /> Contributors &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    <input type="checkbox" name="subscribers" id="subscribers" <?php if($_POST['subscribers']) echo 'checked="checked"'; else echo ""; ?> /> Subscribers<br /><br />
+    <input type="checkbox" name="allincsubs" id="allincsubs" <?php if($_POST['allincsubs']) echo 'checked="checked"'; else echo ""; ?> onclick="selectAllIncSubs(this);"/> <label for="allincsubs">All Users</label><br />
+    <input type="checkbox" name="allbutsubs" id="allbutsubs" <?php if($_POST['allbutsubs']) echo 'checked="checked"'; else echo ""; ?> onclick="selectAllButSubs(this);"/> <label for="allbutsubs">All Users EXCEPT Subscribers</label><br />
+    <input type="checkbox" name="admins" id="admins" <?php if($_POST['admins']) echo 'checked="checked"'; else echo ""; ?> /> <label for="admins">Administrators</label>  &nbsp;
+    <input type="checkbox" name="editors" id="editors" <?php if($_POST['editors']) echo 'checked="checked"'; else echo ""; ?> /> <label for="editors">Editors</label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <input type="checkbox" name="authors" id="authors" <?php if($_POST['authors']) echo 'checked="checked"'; else echo ""; ?> /> <label for="authors">Authors</label><br />
+    <input type="checkbox" name="contributors" id="contributors" <?php if($_POST['contributors']) echo 'checked="checked"'; else echo ""; ?> /> <label for="contributors">Contributors</label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <input type="checkbox" name="subscribers" id="subscribers" <?php if($_POST['subscribers']) echo 'checked="checked"'; else echo ""; ?> /> <label for="subscribers">Subscribers</label><br /><br />
     <input type="submit" name="listbuttonsubmit" style="width: 200px, height: 30px" value="&nbsp;&nbsp;&nbsp;Load the List&nbsp;&nbsp;&nbsp;" />    
     <script type="text/javascript" charset="utf-8">
@@ -176 +209 @@
     <?php $current_user = wp_get_current_user(); ?>
     <p><b>From:</b><br /><input type="text" id="emailfrom" name="emailfrom" size="128" value="<?php if(isset($_POST['emailfrom'])) { echo $_POST['emailfrom']; } else { echo $current_user->user_email; } ?>"/></p>
-    <p><b>Subject:</b><br /><input type="text" id="emailsubject" name="emailsubject" size="128" value="<?php if(isset($_POST['emailsubject'])) { echo $_POST['emailsubject']; } else { echo "WordPress Network Email"; } ?>"/></p>
-    <p><b>Message:</b><br /><textarea cols="125" rows="15" id="emailmessage" name="emailmessage"><?php if(isset($_POST['emailmessage'])) { echo stripslashes(htmlentities($_POST['emailmessage'], ENT_NOQUOTES, 'UTF-8')); } else { echo "Enter message text"; } ?></textarea></p>
+    <p><b>Load a Template:&nbsp;&nbsp;</b>
+    <select name="selecttemplate">
+    <?php nmef_loadalltemplates() ?>
+    <?php //read from wordpress table to get templates stored in database -- foreach( ?>
+    </select>&nbsp;&nbsp;<input type="submit" value="Load Template" name="loadtemplate" id="loadtemplate"> &nbsp;&nbsp;<INPUT Type="BUTTON" VALUE="Add/Edit Templates" ONCLICK="window.location.href='<?php echo network_admin_url( 'admin.php?page=nme_templatespage' ); ?>'">
+    </p>
+    <?php if (isset($_POST['loadtemplate'])) { ?>
+    <p><b>Subject:</b><br /><input type="text" id="emailsubject" name="emailsubject" size="128" value="<?php echo $subject; ?>"/></p>
+    <p><b>Message:</b><br /><textarea cols="125" rows="15" id="emailmessage" name="emailmessage"><?php echo $message; ?></textarea></p> 
+    <?php }
+    else { ?>
+    <p><b>Subject:</b><br /><input type="text" id="emailsubject" name="emailsubject" size="128" value="<?php if(isset($_POST['emailsubject'])) { echo stripslashes(html_entity_decode($_POST['emailsubject'], ENT_NOQUOTES, 'UTF-8')); } else { echo "WordPress Network Email"; } ?>"/></p>
+    <p><b>Message:</b><br /><textarea cols="125" rows="15" id="emailmessage" name="emailmessage"><?php if(isset($_POST['emailmessage'])) { echo stripslashes(html_entity_decode($_POST['emailmessage'], ENT_NOQUOTES, 'UTF-8')); } else { echo "Enter message text"; } ?></textarea></p>    
+    <?php
+    } ?>
     <p><input type="submit" name="submitsendemail" style="width: 199px, height: 31px" text="Send Email" value="Send This Email" onClick="return selectAllEmails();" /> (This may take some time, please do not click twice!)</p>
     <?php
-    if(isset($_POST['listbuttonsubmit']) || isset($_POST['submitsendemail'])) {
+    if( isset($_POST['listbuttonsubmit']) || isset($_POST['submitsendemail']) || isset($_POST['listsubmitted']) ) {
+        ?> <input type="hidden" id="listsubmitted" name="listsubmitted" value="listsubmitted"><?php
         if($nmenoroleserror == false) {
             global $wpdb;
@@ -245 +292 @@
         }
     }
-    if ( ($nmenoroleserror == true) || ( (isset($_POST['listbuttonsubmit']) == false) && (isset($_POST['submitsendemail']) ==false) ) ) { 
-        echo "<h2>Recipients</h2>"; 
-        echo "Select your user role types from Audience above to build a recipient list."; 
+    if ( ($nmenoroleserror == true) || ((isset($_POST['listbuttonsubmit']) == false) && ( isset($_POST['submitsendemail']) ==false)) ) { 
+        if (!isset($_POST['listsubmitted'])) {
+            echo "<h2>Recipients</h2>"; 
+            echo "Select your user role types from Audience above to build a recipient list."; 
+        }
     }
     ?>
@@ -261 +310 @@
     foreach ($blogusers as $user) {
         if($user->user_email != "") {
-            ?><li><?php echo $user->user_email; ?><input type="hidden" name="emaillist[]" value ="<?php echo $user->user_email ?>"></li><?php
-        }
+            ?><li><input type="checkbox" name="emaillist[]" id="<?php echo $user->user_email; ?>" value="<?php echo $user->user_email ?>" <?php if( isset($_POST['emaillist']) ) { if(in_array($user->user_email, $_POST['emaillist'])) { echo 'checked'; } } else { echo 'checked'; }?>>&nbsp;&nbsp;<label for="<?php echo $user->user_email; ?>"><?php echo $user->user_email; ?></li><?php       
+        }
+    }
+    return;
+}
+
+// stuff for message templates in wpdb
+
+// create the table of stored message templates for the nme plugin for the first time
+function nme_install() {
+    global $wpdb;   
+    $table_name = $wpdb->prefix . "networkmassemail";   
+    if ($wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'") != $table_name) {       
+        $sql = "CREATE TABLE " . $table_name . " ( id mediumint(9) NOT NULL AUTO_INCREMENT, name text NOT NULL, subject text NOT NULL, message text NOT NULL, UNIQUE KEY id (id) );";
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+        dbDelta($sql);
+        
+        add_option("nme_db_version", "1.5");
+        
+        $firsttemplatename = "Example";
+        $firsttemplatesubject = "Example Subject";
+        $firsttemplatemessage = "This is an example message.\nYou can store message templates that you would like quick access to by typing up a message and clicking \'Save Template\'.";
+        $rows_affected = $wpdb->insert( $table_name, array( 'name' => $firsttemplatename, 'subject' => $firsttemplatesubject, 'message' => $firsttemplatemessage ) );   
+    }
+    if ($wpdb->get_var( "SELECT name FROM " . $table_name . " WHERE name='Example'") != "Example" ) {       
+        $firsttemplatename = "Example";
+        $firsttemplatesubject = "Example Subject";
+        $firsttemplatemessage = "This is an example message.
+        
+        You can store message templates that you would like quick access to by typing up a message and clicking 'Save Template'.";
+        $rows_affected = $wpdb->insert( $table_name, array( 'name' => $firsttemplatename, 'subject' => $firsttemplatesubject, 'message' => $firsttemplatemessage ) );   
     }
 }

network-mass-email/trunk/readme.txt

@@ -2 +2 @@
 Contributors: kzaron
 Tags: multisite, network, email
-Requires at least: 3.4
-Tested up to: 3.4.1
-Stable tag: 1.4.2
+Requires at least: 3.3
+Tested up to: 3.5
+Stable tag: 1.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -58 +58 @@
 == Changelog ==
 
+= 1.5 =
+* Big Update - Lots of stuff!
+* Added message templates! You can now save message templates to re-use at a later date!
+* Added checkboxes to all users when they are loaded with 'load the list'. This means you can now manually uncheck users that you would like not to receive an email you are sending and vice-versa.
+* Moved the menu for the plguin to the main Network Admin menu. It now has it's own icon and submenus instead of being listed under 'Users'.
+* Updated the plugin compatibility for 'compatible up to' and 'requires'.
+* Added checkbox labels to all checkboxes that appear. I don't know why they weren't there in the first place...
+* Added more tweaks to variable formatting so that messages are stored and are sent as intended when you compose them.
+
 = 1.4.2 =
 * Applied a fix (again) for escaping slashes and special characters in email body contents.
 
 = 1.4.1 =
-* Applied a fix for escaping slashes in email body contents. UPDATE: This didn't work =(
+* Applied a fix for escaping slashes in email body contents. UPDATE: This fix did not work, was patched in 1.4.2.
 
 = 1.4 =