wpmu-ldap-commits Mailing List for WPMU LDAP Plugin (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 71
          http://wpmu-ldap.svn.sourceforge.net/wpmu-ldap/?rev=71&view=rev
Author:   axelseaa
Date:     2009-03-15 19:50:30 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
added the ability to email new users when they are added to blog, and allows for message customization.  Also corrected issue with default settings on an initial install.

Modified Paths:
--------------
    trunk/ldap/lib/wpmu_ldap.functions.php
    trunk/ldap/lib/wpmu_ldap_adduser.functions.php
    trunk/ldap/lib/wpmu_ldap_admin.functions.php

Modified: trunk/ldap/lib/wpmu_ldap.functions.php
===================================================================

--- trunk/ldap/lib/wpmu_ldap.functions.php	2009-03-08 05:58:20 UTC (rev 70)
+++ trunk/ldap/lib/wpmu_ldap.functions.php	2009-03-15 19:50:30 UTC (rev 71)
@@ -186,7 +186,7 @@
 		if ($createUser) {
 			if ($user_id = username_exists($username)) {
 				if (wpmuLdapAddUserToBlog($user_id,$blog_id,$new_role)) {
-					return array( true );
+					return array( true, $user_id );
 				}
 			}
 			if (wpmuLdapCreateWPUserFromLdap($username,'',$userDataArray)) {

Modified: trunk/ldap/lib/wpmu_ldap_adduser.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2009-03-08 05:58:20 UTC (rev 70)
+++ trunk/ldap/lib/wpmu_ldap_adduser.functions.php	2009-03-15 19:50:30 UTC (rev 71)
@@ -78,6 +78,7 @@
 			$result = wpmuLdapSearchUser($username,$blog_id,$user['new_role']);
 		        $ldapCreateLocalUser = get_site_option('ldapCreateLocalUser');
 			if ($result[0]) {
+                                wp_new_user_notification($result[1]);
 				ldapAddUserResult(array('updated' => 'true','action' => 'add','username' => $username));
 			} elseif ($ldapCreateLocalUser || is_site_admin($current_user->username))  {
                 	        ?>
@@ -97,9 +98,10 @@
 			}
 		} else {
 			// Add User to Blog
-			if (wpmuLdapAddUserToBlog($login->ID,$blog_id,$user['new_role']))
+			if (wpmuLdapAddUserToBlog($login->ID,$blog_id,$user['new_role'])) {
+                                wp_new_user_notification($login->ID);
 				ldapAddUserResult(array('updated' => 'true','action' => 'add','username' => $username));
-			else
+			} else
 				ldapAddUserResult(array('updated' => 'false','action' => 'exists','username' => $username));
 		}
 	} elseif ($_POST['addUserBulk']) {
@@ -121,15 +123,17 @@
 				if (!$login) {
 					$result = wpmuLdapSearchUser($username,$blog_id,$user['bulk_new_role']);
 					if ($result[0]) {
+		                                wp_new_user_notification($result[1]);
 						ldapAddUserResult(array('updated' => 'true','action' => 'add','username' => $username));
 					} else {
 						ldapAddUserResult(array('updated' => 'false','action' => 'notfound','username' => $username));
 					}
 				} else {
 					// Add User to Blog
-					if (wpmuLdapAddUserToBlog($login->ID,$blog_id,$user['bulk_new_role']))
+					if (wpmuLdapAddUserToBlog($login->ID,$blog_id,$user['bulk_new_role'])) {
+                                                wp_new_user_notification($login->ID);
 						ldapAddUserResult(array('updated' => 'true','action' => 'add','username' => $username));
-					else
+					} else
 						ldapAddUserResult(array('updated' => 'false','action' => 'exists','username' => $username));
 				}
 			}

Modified: trunk/ldap/lib/wpmu_ldap_admin.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap_admin.functions.php	2009-03-08 05:58:20 UTC (rev 70)
+++ trunk/ldap/lib/wpmu_ldap_admin.functions.php	2009-03-15 19:50:30 UTC (rev 71)
@@ -78,6 +78,41 @@
 }
 
 function getWpmuLdapSiteOptions() {
+	$defaultSignupMessage = 'Public sign-up has been disabled.';
+
+	$sysAdminEmail = get_site_option('admin_email');
+	$defaultGetPasswordMessage = <<<GetPasswordMsg
+Your account is tied to an account in the central directory.  You cannot
+retrieve your password via email.  Please contact the
+<a href="mailto:$sysAdminEmail">system administrator</a> for information on how
+to reset your password.
+GetPasswordMsg;
+
+	$defaultLDAPEmailSubj = $defaultLocalEmailSubj = 'Blogging Account Created';
+	$defaultLDAPEmailMessage = 'Dear User,
+
+You have just been permitted to access a new blog!
+
+Username: USERNAME
+Login: LOGINLINK
+
+We hope you enjoy your new weblog.
+ Thanks!
+
+--Wordpress';
+	$defaultLocalEmailMessage = 'Dear User,
+
+You have just been permitted to access a new blog!
+
+Username: USERNAME
+Password: PASSWORD
+Login: LOGINLINK
+
+We hope you enjoy your new weblog.
+ Thanks!
+
+--Wordpress';
+
 	$ret = array();
 	$ret['ldapAuth']		= get_site_option('ldapAuth');
 	$ret['ldapCreateAcct']		= get_site_option('ldapCreateAcct');
@@ -90,6 +125,12 @@
 	$ret['ldapEnableSSL']		= get_site_option('ldapEnableSSL');
 	$ret['ldapServerPass']		= get_site_option('ldapServerPass');
 	$ret['ldapDisableSignup']	= get_site_option('ldapDisableSignup');
+	$ret['ldapLocalEmail']		= get_site_option('ldapLocalEmail');
+	$ret['ldapLocalEmailSubj']	= get_site_option('ldapLocalEmailSubj',$defaultLocalEmailSubj);
+	$ret['ldapLocalEmailMessage']	= stripslashes(get_site_option('ldapLocalEmailMessage', $defaultLocalEmailMessage));
+	$ret['ldapLDAPEmail']		= get_site_option('ldapLDAPEmail');
+	$ret['ldapLDAPEmailSubj']	= get_site_option('ldapLDAPEmailSubj',$defaultLDAPEmailSubj);
+	$ret['ldapLDAPEmailMessage']	= stripslashes(get_site_option('ldapLDAPEmailMessage', $defaultLDAPEmailMessage));
 	$ret['ldapCreateLocalUser']	= get_site_option('ldapCreateLocalUser');
 	$ret['ldapSignupMessage']	= stripslashes(get_site_option('ldapSignupMessage', $defaultSignupMessage));
 	$ret['ldapGetPasswordMessage']	= stripslashes(get_site_option('ldapGetPasswordMessage', $defaultGetPasswordMessage));
@@ -99,16 +140,6 @@
 }
 
 function ldapOptionsPanelGeneral() {
-	$defaultSignupMessage = 'Public sign-up has been disabled.';
-
-	$sysAdminEmail = get_site_option('admin_email');
-	$defaultGetPasswordMessage = <<<GetPasswordMsg
-Your account is tied to an account in the central directory.  You cannot
-retrieve your password via email.  Please contact the
-<a href="mailto:$sysAdminEmail">system administrator</a> for information on how
-to reset your password.
-GetPasswordMsg;
-
 	extract(getWpmuLdapSiteOptions());
 
 	// default values to avoid PHP notices about unset values
@@ -129,6 +160,12 @@
 	if($ldapDisableSignup) 	$tDisableSignup = "checked='checked'";
 	else $fDisableSignup = "checked='checked'";
 
+	if($ldapLocalEmail) $tLocalEmail = "checked='checked'";
+	else $fLocalEmail = "checked='checked'";
+
+	if($ldapLDAPEmail) $tLDAPEmail = "checked='checked'";
+	else $fLDAPEmail = "checked='checked'";
+
 	if($ldapCreateLocalUser) $tCreateLocalUser = "checked='checked'";
 	else $fCreateLocalUser = "checked='checked'";
 
@@ -208,6 +245,34 @@
 				This is the error message that would be displayed when an LDAP-account user submits "Lost Password" requests.
 			   </td>
 			</tr>
+			<tr valign="top">
+			   <th scope="row">New user email notification (Local Users):</th>
+			   <td>
+				<input type='radio' name='ldapLocalEmail' id='disableLocalEmailYes' value='1' <?php echo $tLocalEmail; ?>/> <label for="disableLocalEmailYes">Yes</label>
+				<input type='radio' name='ldapLocalEmail' id='disableLocalEmailNo' value='0' <?php echo $fLocalEmail; ?>/> <label for="disableLocalEmailNo">No</label>
+				<br/>
+				Controls whether or not local users are emailed on account creation or when receiving access to a new blog.
+				<br/><br/>
+				<label for="ldapLocalEmailSubj">Email Subject:</label><br/>
+				<input type="text" name="ldapLocalEmailSubj" id="ldapLocalEmailSubj" value="<?php echo $ldapLocalEmailSubj ?>" /><br />
+				<label for="ldapLocalEmailMessage">Email Body:</label><br/>
+				<textarea name="ldapLocalEmailMessage" id="ldapLocalEmailMessage" rows="5" cols="45" style="width: 95%;"><?php echo $ldapLocalEmailMessage ?></textarea>
+			   </td>
+			</tr>
+			<tr valign="top">
+			   <th scope="row">New user email notification (LDAP Users):</th>
+			   <td>
+				<input type='radio' name='ldapLDAPEmail' id='disableLDAPEmailYes' value='1' <?php echo $tLDAPEmail; ?>/> <label for="disableLDAPEmailYes">Yes</label>
+				<input type='radio' name='ldapLDAPEmail' id='disableLDAPEmailNo' value='0' <?php echo $fLDAPEmail; ?>/> <label for="disableLDAPEmailNo">No</label>
+				<br/>
+				Controls whether or not ldap users are emailed on account creation or when receiving access to a new blog.
+				<br/><br/>
+				<label for="ldapLDAPEmailSubj">Email Subject:</label><br/>
+				<input type="text" name="ldapLDAPEmailSubj" id="ldapLDAPEmailSubj" value="<?php echo $ldapLDAPEmailSubj ?>" /><br />
+				<label for="ldapLDAPEmailMessage">Email Body:</label><br/>
+				<textarea name="ldapLDAPEmailMessage" id="ldapLDAPEmailMessage" rows="5" cols="45" style="width: 95%;"><?php echo $ldapLDAPEmailMessage ?></textarea>
+			   </td>
+			</tr>
 		</table>
 		<p class="submit"><input type="submit" name="ldapOptionsSave" value="Save Options" /></p>
 	</form>
@@ -274,7 +339,7 @@
 			   </td>
 			</tr>
 			<tr valign="top">
-			   <th scope="row"><label for="serverPort">LDAP Server Port:</label></th>
+			   <th scope="row"><label for="serverPort">Server Port:</label></th>
 			   <td>
 				<input type='text' name='ldapServerPort' id='serverPort' value='<?php echo $ldapServerPort ?>' style='width: 300px;' />
 				<br/>
@@ -421,30 +486,49 @@
  *
  */
 function wp_new_user_notification($user_id, $plaintext_pass = '') {
+	global $current_site;
 	$user = new WP_User($user_id);
 
 	$user_login = stripslashes($user->user_login);
 	$user_email = stripslashes($user->user_email);
 	$ldap_login = get_usermeta($user_id, 'ldap_login');
 
-	$message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
-	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-	$message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
+	if (empty($plaintext_pass)) $plaintext_pass = "Your SITE_NAME Password";
 
-	@wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
+	$msg  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
+	$msg .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
+	$msg .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
 
-	if ($ldap_login == true) {
-		$message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
-		$message .= get_option('siteurl') . "/wp-login.php\r\n";
-	} else {
-		if ( empty($plaintext_pass) )
-			return;
-		$message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
-		$message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-		$message .= get_option('siteurl') . "/wp-login.php\r\n";
+	$subj = 'Blogging Account Created';
+
+	if ($ldap_login == true) { // LDAP Users
+		if (get_site_option('ldapLDAPEmail')) { // Check to see if LDAP email notifications are enabled
+			$msg .= sprintf(__('Username: %s'), $user_login) . "\r\n";
+			$msg .= get_option('siteurl') . "LOGINLINK\r\n";
+			$ldapmsg = get_site_option('ldapLDAPEmailMessage');
+			if (!empty($ldapmsg)) $msg = $ldapmsg;
+			$ldapsubj = get_site_option('ldapLDAPEmailSubj');
+			if (!empty($ldapsubj)) $subj = $ldapsubj;
+		} else return;
+	} else { // Local Users
+		if (get_site_option('ldapLocalEmail')) { // Check to see if local email notifications are enabled
+			$msg .= sprintf(__('Username: %s'), $user_login) . "\r\n";
+			$msg .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
+			$msg .= get_option('siteurl') . "/wp-login.php\r\n";
+			$localmsg = get_site_option('ldapLocalEmailMessage');
+			if (!empty($localmsg)) $msg = $localmsg;
+			$localsubj = get_site_option('ldapLocalEmailSubj');
+			if (!empty($localsubj)) $subj = $localsubj;
+		} else return;
 	}
 
-	wp_mail($user_email, sprintf(__('[%s] Blogging Account Created'), get_option('blogname')), $message);
+        $msg = str_replace( "PASSWORD", $plaintext_pass, $msg );
+        $msg = str_replace( "SITE_NAME", $current_site->site_name, $msg );
+        $msg = str_replace( "USERNAME", $user_login, $msg );
+        $msg = str_replace( "USEREMAIL", $user_email, $msg );
+        $msg = str_replace( "LOGINLINK", site_url( 'wp-login.php' ), $msg );
+
+	wp_mail($user_email, sprintf(__('[%s] %s'), get_option('blogname'), $subj), $msg);
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2008	Jan	Feb	Mar	Apr	May (1)	Jun (7)	Jul (5)	Aug (1)	Sep	Oct (1)	Nov	Dec
2009	Jan	Feb (5)	Mar (9)	Apr (5)	May (3)	Jun (2)	Jul (9)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2010	Jan (5)	Feb (1)	Mar	Apr (1)	May (3)	Jun (5)	Jul (1)	Aug	Sep	Oct (1)	Nov	Dec
2011	Jan	Feb (3)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

wpmu-ldap-commits Mailing List for WPMU LDAP Plugin (Page 3)

Deprecated project - see http://wordpress.org/extend/plugins/wpmuldap/

wpmu-ldap-commits — SVN Commits List