From 686c7187ff2e90124652d4a215c4a339f9b3e405 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 16 May 2015 23:59:43 -0700
Subject: [PATCH] Fix for signup template constants under CLI (scheduled task)

---
 e107_admin/mailout.php                 |  2 +-
 e107_admin/users.php                   | 12 +++++++++---
 e107_core/templates/email_template.php |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 5ef52ddad..57ef4a9e5 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -76,7 +76,7 @@ if (!getperms('W'))
 }
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_users.php');
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_mailout.php');
-	e107::lan('core','signup');
+//	e107::lan('core','signup');
 
 require_once(e_HANDLER.'ren_help.php');
 
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 8f323a04c..e3c63f483 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1914,8 +1914,9 @@ class users_admin_ui extends e_admin_ui
 
 				if(!$sql2->update('user',$updateQry))
 				{
-					echo "error updating user's password";
-					print_a($updateQry);
+
+					e107::getMessage()->addError("Error updating user's password. #".$row['user_id']." : ".$row['user_email']);
+					e107::getMessage()->addDebug(print_a($updateQry,true));
 
 				//	break;
 				}
@@ -1933,6 +1934,9 @@ class users_admin_ui extends e_admin_ui
 				$rawPassword = '(*** hidden ***)';
 			}
 
+			$activationUrl = SITEURL."signup.php?activate.".$row['user_id'].".".$row['user_sess'];
+
+
 
 			$recipients[] = array(
 				'mail_recipient_id'     => $row['user_id'],
@@ -1946,9 +1950,11 @@ class users_admin_ui extends e_admin_ui
 					'SUBJECT'               => LAN_SIGNUP_98,
 					'USERNAME' 		        => $row['user_name'],
 					'USERLASTVISIT'         => $row['user_lastvisit'],
-					'ACTIVATION_LINK'       =>  SITEURL."signup.php?activate.".$row['user_id'].".".$row['user_sess'],
+					'ACTIVATION_LINK'       => "<a href='".$activationUrl."'>".$activationUrl."</a>",
+					'ACTIVATION_URL'        => $activationUrl,
 					'DATE_SHORT'            => $tp->toDate(time(),'short'),
 					'DATE_LONG'             => $tp->toDate(time(),'long'),
+					'SITEURL'               => SITEURL
 				)
 			);
 
diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php
index 7566d76a2..2853c8273 100644
--- a/e107_core/templates/email_template.php
+++ b/e107_core/templates/email_template.php
@@ -38,6 +38,7 @@ See e_HANDLER.mail.php for more information
 if (!defined('e107_INIT')) { exit; }
 
 $includeSiteButton = e107::getPref('sitebutton');
+e107::lan('core','signup'); // required for when mailer runs under CLI. 
 
 /*
 $SIGNUPEMAIL_SUBJECT = LAN_SIGNUP_96.' {SITENAME}';
@@ -181,8 +182,8 @@ $EMAIL_TEMPLATE['signup']['footer']			= "</div>
 $EMAIL_TEMPLATE['signup']['cc']				= "";
 $EMAIL_TEMPLATE['signup']['bcc']			= "";
 $EMAIL_TEMPLATE['signup']['attachments']	= "";
+$EMAIL_TEMPLATE['signup']['include']        = "{e_LANGUAGEDIR}{e_LANGUAGE}/lan_signup.php";
 
-//TODO FIXME {SITEBUTTON} not working at the moment. (broken path)
 
 // -----------------------------