";
+
+ }
+
+
+ return false;
+
+ }
+
}
?>
\ No newline at end of file
diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php
index 6917ea200..d3b000080 100755
--- a/e107_core/templates/signup_template.php
+++ b/e107_core/templates/signup_template.php
@@ -209,7 +209,7 @@ if(!defined($COPPA_FAIL))
if(!defined($SIGNUP_BEGIN))
{
$SIGNUP_BEGIN = "
- {SIGNUP_FORM_OPEN} {SIGNUP_SIGNUP_TEXT}";
+ {SIGNUP_FORM_OPEN} {SIGNUP_ADMINOPTIONS} {SIGNUP_SIGNUP_TEXT}";
}
if(!defined($SIGNUP_BODY))
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 3b4855bdd..accff6b8c 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -212,6 +212,7 @@ class e107
'userlogin' => '{e_HANDLER}login.php',
'validatorClass' => '{e_HANDLER}validator_class.php',
'xmlClass' => '{e_HANDLER}xml_class.php',
+ 'e107MailManager' => '{e_HANDLER}mail_manager_class.php'
);
/**
@@ -1206,6 +1207,17 @@ class e107
return self::getSingleton('e107Email', true);
}
+
+ /**
+ * Retrieve e107Email mail mailer object.
+ *
+ * @return e107MailManager
+ */
+ public static function getBulkEmail()
+ {
+ return self::getSingleton('e107MailManager', true);
+ }
+
/**
* Retrieve event singleton object
*
diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php
index af9201bed..8541732d5 100644
--- a/e107_handlers/mail_manager_class.php
+++ b/e107_handlers/mail_manager_class.php
@@ -884,7 +884,9 @@ class e107MailManager
//'wordwrap' - Set wordwrap value
//'split' - If true, sends an individual email to each recipient
'template' => 'mail_send_style', // required
- 'shortcodes' => 'mail_target_info' // required
+ 'shortcodes' => 'mail_target_info', // required
+ 'e107_header' => 'mail_recipient_id'
+
);
@@ -1725,9 +1727,9 @@ class e107MailManager
public function sendEmails($templateName, $emailData, $recipientData, $extra = FALSE)
{
$log = e107::getAdminLog();
- $log->addDebug(print_a($emailData, true),true);
- $log->addDebug(print_a($recipientData, true),true);
- $log->toFile('mail_manager','Mail Manager Log',true);
+ $log->addDebug(print_r($emailData, true),true);
+ $log->addDebug(print_r($recipientData, true),true);
+ $log->toFile('mail_manager','Mail Manager Log', true);
if (!is_array($emailData))
diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index 3d435cd85..7b83b9c10 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -1144,6 +1144,15 @@ class e_system_user extends e_user_model
$eml['e107_header'] = $userInfo['user_id'];
// $mailer->AddCustomHeader("X-e107-id: {$userInfo['user_id']}");
}
+
+
+ if(getperms('0') && E107_DEBUG_LEVEL > 0)
+ {
+ e107::getMessage()->addDebug("Email Debugger active. Simulation Only!");
+ e107::getMessage()->addDebug($mailer->preview($eml));
+ return true;
+ }
+
return $mailer->sendEmail($userInfo['user_email'], $userInfo['user_name'], $eml, false);
}
diff --git a/signup.php b/signup.php
index aa6ddd1a8..d4601c142 100644
--- a/signup.php
+++ b/signup.php
@@ -50,142 +50,6 @@ $text = '';
$extraErrors = array();
$error = FALSE;
-//-------------------------------
-// Resend Activation Email
-//-------------------------------
-/*
-if((e_QUERY == 'resend') && !USER && ($pref['user_reg_veri'] == 1))
-{
- require_once(HEADERF);
-
- $clean_email = $tp->toDB($_POST['resend_email']);
- if(!check_email($clean_email))
- {
- $clean_email = "xxx";
- }
-
- $new_email = $tp->toDB(varset($_POST['resend_newemail'], ''));
- if(!check_email($new_email ))
- {
- $new_email = FALSE;
- }
-
- if($_POST['submit_resend'])
- { // Action user's submitted information
- // 'resend_email' - user name or email address actually used to sign up
- // 'resend_newemail' - corrected email address
- // 'resend_password' - password (required if changing email address)
-
- if($_POST['resend_email'] && !$new_email && $clean_email && $sql->gen("SELECT * FROM #user WHERE user_ban=0 AND user_sess='' AND (`user_loginname`= '".$clean_email."' OR `user_name` = '".$clean_email."' OR `user_email` = '".$clean_email."' ) "))
- { // Account already activated
- $ns->tablerender(LAN_SIGNUP_40,LAN_SIGNUP_41." ");
- require_once(FOOTERF);
- exit();
- }
-
-
- // Start by looking up the user
- if(!$sql->select("user", "*", "(`user_loginname` = '".$clean_email."' OR `user_name` = '".$clean_email."' OR `user_email` = '".$clean_email."' ) AND `user_ban`=".USER_REGISTERED_NOT_VALIDATED." AND `user_sess` !='' LIMIT 1"))
- {
- message_handler("ALERT",LAN_SIGNUP_64.': '.$clean_email); // email (or other info) not valid.
- require_once(FOOTERF);
- exit();
- }
- $row = $sql -> fetch();
- // We should have a user record here
-
- if(trim($_POST['resend_password']) !="" && $new_email)
- { // Need to change the email address - check password to make sure
- if ($userMethods->CheckPassword($_POST['resend_password'], $row['user_loginname'], $row['user_password']) === TRUE)
- {
- if ($sql->select('user', 'user_id, user_email', "user_email='".$new_email."'"))
- { // Email address already used by someone
- message_handler("ALERT",LAN_SIGNUP_106); // Duplicate email
- require_once(FOOTERF);
- exit();
- }
- if($sql->update("user", "user_email='".$new_email."' WHERE user_id = '".$row['user_id']."' LIMIT 1 "))
- {
- $row['user_email'] = $new_email;
- }
- }
- else
- {
- message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
- require_once(FOOTERF);
- exit();
- }
- }
-
- // Now send the email - got some valid info
- $row['user_password'] = 'xxxxxxx'; // Don't know the real one
- $eml = render_email($row);
- $eml['e107_header'] = $row['user_id'];
- require_once(e_HANDLER.'mail.php');
- $mailer = new e107Email();
-
- if(!$mailer->sendEmail(USEREMAIL, USERNAME, $eml, FALSE))
-
- $do_log['signup_action'] = LAN_SIGNUP_63;
-
- if(!sendemail($row['user_email'], $eml['subject'], $eml['message'], $row['user_name'], "", "", $eml['attachments'], $eml['cc'], $eml['bcc'], $returnpath, $returnreceipt,$eml['inline-images']))
- {
- $ns->tablerender(LAN_ERROR,LAN_SIGNUP_42);
- $do_log['signup_result'] = LAN_SIGNUP_62;
- }
- else
- {
- $ns->tablerender(LAN_SIGNUP_43,LAN_SIGNUP_44." ".$row['user_email']." - ".LAN_SIGNUP_45."
");
- $do_log['signup_result'] = LAN_SIGNUP_61;
- }
- // Now log this (log will ignore if its disabled)
- $admin_log->user_audit(USER_AUDIT_PW_RES,$do_log,$row['user_id'],$row['user_name']);
- require_once(FOOTERF);
- exit;
- }
- elseif(!$_POST['submit_resend'])
- {
- // Display form to get info from user
- $text .= "
-
-
";
-
- $ns->tablerender(LAN_SIGNUP_47, $text);
- require_once(FOOTERF);
- exit;
- }
- exit;
-}*/
-
// ------------------------------------------------------------------
if(!$_POST)
@@ -230,29 +94,6 @@ if ((USER || (intval($pref['user_reg']) !== 1) || (vartrue($pref['auth_method'],
}
-if(getperms('0')) // allow main admin to view signup page for design/testing.
-{
- //$mes = e107::getMessage();
- //$mes->debug("You are currently logged in.");
-
- $adminMsg = "