From 41879e8a94298e63c90585aceca6391563338b24 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 29 Oct 2017 11:25:05 -0700
Subject: [PATCH] Issue #1745 - Initial Userclass was not being saved during
 Activation by admin.

---
 e107_admin/users.php         | 20 +++++++++++++++-----
 e107_handlers/user_model.php |  5 +++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/e107_admin/users.php b/e107_admin/users.php
index d94811959..4118c929b 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -167,7 +167,7 @@ JS;
 				case 'resend':
 				case 'loginas':
 				case 'unadmin':
-					$_POST['etrigger_'.$_POST['useraction']] = $_POST['userid'];
+					$_POST['etrigger_'.$_POST['useraction']] = intval($_POST['userid']);
 				break;
 
 
@@ -680,12 +680,19 @@ class users_admin_ui extends e_admin_ui
 				->set('user_sess', '');
 				
 			$row = $sysuser->getData();
-			if ($userMethods->userClassUpdate($row, 'userall'))
+			
+			if ($initUserclasses = $userMethods->userClassUpdate($row, 'userall'))
 			{
-				$sysuser->set('user_class', $row['user_class']);
+				$row['user_class'] = $initUserclasses;
 			}
+
 			$userMethods->addNonDefaulted($row);
-			$sysuser->setData($row)->save();
+			$sysuser->setData($row);
+
+		//	$res = $sysuser->getData();
+		//	e107::getDebug()->log($res);
+
+			$sysuser->save();
 			
 			e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
 			e107::getEvent()->trigger('userfull', $row); //BC
@@ -704,7 +711,10 @@ class users_admin_ui extends e_admin_ui
 					'mail_subject' => USRLAN_113.' '.SITENAME,
 					'mail_body' => nl2br($message),
 				);
-				if($sysuser->email('email', $options))
+
+			//	$options['debug'] = 1;
+
+				if($ret =$sysuser->email('email', $options))
 				{
 					$mes->addSuccess(USRLAN_224." ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
 				}
diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index 784a0a748..03e89fde9 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -1212,6 +1212,11 @@ class e_system_user extends e_user_model
 			return true;
 		}
 
+		if(!empty($options['debug']))
+		{
+			return $mailer->preview($eml);
+		}
+
 		
 		return $mailer->sendEmail($userInfo['user_email'], $userInfo['user_name'], $eml, false);
 	}