Fixed typo in the template variables description that could cause cus…

…tom e-mail templates to send %PASSWORD% instead of the user's password if followed (actual variable is %PASS%).

includes/sql/install.sql

@@ -366,11 +366,11 @@ CREATE TABLE IF NOT EXISTS `%PRE%templates` (
 
 INSERT INTO `%PRE%templates` (`id`, `name`, `acpvisual`, `subject`, `content`, `description`) VALUES
 (1, 'reset', 'Client Reset Password', 'New Password', '<p><span style="font-weight: bold;">Your password has been reset!<br /><span style="font-weight: normal;">New Password: %PASS%<br /><br /><span style="font-weight: bold;"><span style="color: #ff0000;">Notice!<br /><span style="color: #000000;"><span style="font-weight: normal;">If you didn''t use the forgot password feature, we suggest you log into client area with your new password and use a different email.</span></span></span></span></span></span></p>', 'This is the email a user recieves when they reset their password.<br /><br />\r\n\r\nTemplate Variables:<br />\r\n%PASS% = Their new password'),
-(3, 'newacc', 'New Hosting Account', 'Your Hosting Account', '<p><span style="font-weight: bold;">Your account has been created!<br /><span style="font-weight: normal;">Your account has been successfully created and you''re now able to log into your client control panel and your web hosting control panel. Your details are as follows:</span></span></p>\r\n<p><span style="font-weight: bold;">Username: </span>%USER%<br /><span style="font-weight: bold;">Password: </span>%PASS%<br /><span style="font-weight: bold;">Email: </span>%EMAIL%<br /><span style="font-weight: bold;">Domain/Subdomain: </span>%DOMAIN%<br /><span style="font-weight: bold;">Package: </span>%PACKAGE%</p>', 'This is the email a client gets when they first go though the order form and complete it. This email should contain all they''re details.<br /><br />\r\n\r\nTemplate Variables:<br />\r\n%USER% - Client Username<br />\r\n%PASSWORD% - Client Password<br />\r\n%EMAIL% - Client Email<br />\r\n%DOMAIN% - The clients package url<br />\r\n%PACKAGE% - The package the client signed up for'),
+(3, 'newacc', 'New Hosting Account', 'Your Hosting Account', '<p><span style="font-weight: bold;">Your account has been created!<br /><span style="font-weight: normal;">Your account has been successfully created and you''re now able to log into your client control panel and your web hosting control panel. Your details are as follows:</span></span></p>\r\n<p><span style="font-weight: bold;">Username: </span>%USER%<br /><span style="font-weight: bold;">Password: </span>%PASS%<br /><span style="font-weight: bold;">Email: </span>%EMAIL%<br /><span style="font-weight: bold;">Domain/Subdomain: </span>%DOMAIN%<br /><span style="font-weight: bold;">Package: </span>%PACKAGE%</p>', 'This is the email a client gets when they first go though the order form and complete it. This email should contain all they''re details.<br /><br />\r\n\r\nTemplate Variables:<br />\r\n%USER% - Client Username<br />\r\n%PASS% - Client Password<br />\r\n%EMAIL% - Client Email<br />\r\n%DOMAIN% - The clients package url<br />\r\n%PACKAGE% - The package the client signed up for'),
 (4, 'termacc', 'Client Terminated', 'Termination', '<p><span style="font-weight: bold;">Your account has been terminated!<br /><span style="font-weight: normal;">This now means that your client username and password no longer exists. This is the same with your web hosting panel. All your files, databases, records have been removed and aren''t retrievable.<br /><br /><span style="font-weight: bold;">Reason for termination: </span>%REASON%</span></span></p>', 'This is the email the client recives when their account has been terminated by admin or when they manually deleted it in the client control panel.<br /><br />\r\n\r\nEmail Variables:<br />\r\n%REASON% - The reason why their account has been terminated'),
 (5, 'suspendacc', 'Suspended Account', 'Suspended', '<p><span style="font-weight: bold;">Your Account Has Been Suspended!<br /><span style="font-weight: normal;">This means that your site on control panel is no longer accessable. Your website and all its content still remain intact. Contact your host for further details.</span></span></p>', 'This is the email the client recieves when they''re account has been suspended. '),
 (6, 'unsusacc', 'Unsuspended Account', 'Unsuspended', '<p><span style="font-family: ''Times New Roman''; font-size: 16px;">\r\n<div style="color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; background-image: initial; background-repeat: initial; background-attachment: initial; -webkit-background-clip: initial; -webkit-background-origin: initial; background-color: #ffffff; background-position: initial initial; margin: 8px;">\r\n<p><span style="font-weight: bold;">Your Account Has Been Unsuspended!<br /><span style="font-weight: normal;">This means that your site on control panel is now accessable. Your website and all its content still remain intact and can be accessed.</span></span></p>\r\n</div>\r\n</span></p>', 'This is the email a client recieves when their account has been unsuspended.'),
-(7, 'newaccadmin', 'Awaiting Validation', 'Awaiting Admin', '<p><span style="font-family: ''Times New Roman''; font-size: 16px;">\r\n<div style="color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; background-image: initial; background-repeat: initial; background-attachment: initial; -webkit-background-clip: initial; -webkit-background-origin: initial; background-color: #ffffff; background-position: initial initial; margin: 8px;">\r\n<p><span style="font-weight: bold;">Your account is awaiting admin validation!<br /><span style="font-weight: normal;">Your account has been successfully created but you need to wait for an admin to approve your account! You''re now able to log into your client control panel. Your details are as follows:</span></span></p>\r\n<p><span style="font-weight: bold;">Username:&nbsp;</span>%USER%<br /><span style="font-weight: bold;">Password:&nbsp;</span>%PASS%<br /><span style="font-weight: bold;">Email:&nbsp;</span>%EMAIL%<br /><span style="font-weight: bold;">Domain/Subdomain:&nbsp;</span>%DOMAIN%<br /><span style="font-weight: bold;">Package:&nbsp;</span>%PACKAGE%</p>\r\n</div>\r\n</span></p>', 'This is the email a client gets when they first go though the order form and complete it but are awaiting the admin. This email should contain all they''re details.<br /><br />\r\n\r\nTemplate Variables:<br />\r\n%USER% - Client Username<br />\r\n%PASSWORD% - Client Password<br />\r\n%EMAIL% - Client Email<br />\r\n%DOMAIN% - The clients package url<br />\r\n%PACKAGE% - The package the client signed up for'),
+(7, 'newaccadmin', 'Awaiting Validation', 'Awaiting Admin', '<p><span style="font-family: ''Times New Roman''; font-size: 16px;">\r\n<div style="color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; background-image: initial; background-repeat: initial; background-attachment: initial; -webkit-background-clip: initial; -webkit-background-origin: initial; background-color: #ffffff; background-position: initial initial; margin: 8px;">\r\n<p><span style="font-weight: bold;">Your account is awaiting admin validation!<br /><span style="font-weight: normal;">Your account has been successfully created but you need to wait for an admin to approve your account! You''re now able to log into your client control panel. Your details are as follows:</span></span></p>\r\n<p><span style="font-weight: bold;">Username:&nbsp;</span>%USER%<br /><span style="font-weight: bold;">Password:&nbsp;</span>%PASS%<br /><span style="font-weight: bold;">Email:&nbsp;</span>%EMAIL%<br /><span style="font-weight: bold;">Domain/Subdomain:&nbsp;</span>%DOMAIN%<br /><span style="font-weight: bold;">Package:&nbsp;</span>%PACKAGE%</p>\r\n</div>\r\n</span></p>', 'This is the email a client gets when they first go though the order form and complete it but are awaiting the admin. This email should contain all they''re details.<br /><br />\r\n\r\nTemplate Variables:<br />\r\n%USER% - Client Username<br />\r\n%PASS% - Client Password<br />\r\n%EMAIL% - Client Email<br />\r\n%DOMAIN% - The clients package url<br />\r\n%PACKAGE% - The package the client signed up for'),
 (8, 'adminval', 'Admin - User Needs Validating', 'User Awaiting Validation', '<p><span style="font-weight: bold;">A Client Is Awaiting Admin Validation!<br /><span style="font-weight: normal;">Log into your ACP now to approve or decline that client.</span></span></p>', 'This the email you recieve when a user has signed up to a package requiring admin validation and is awaiting it.'),
 (9, 'approvedacc', 'Account Approved', 'Account Approved', '<p><span style="font-weight: bold;">Your account has now been approved!<br /><span style="font-weight: normal;">This means that your account is now active and the details that were sent in your previous email now work. You can proceed to your hosting control panel.</span></span></p>', 'This is the email the client recieves when they''re package has been validated by you.'),
 (10, 'declinedacc', 'Declined Account', 'Account Declined', '<p><span style="font-weight: bold;">Your account has been declined!<br /><span style="font-weight: normal;">An admin has declined your account. Your record has been deleted from the database. You may try and signup again.</span></span></p>', 'This is the email recieved when you decline a account that needs admin validation.'),

includes/sql/upgrade.sql

@@ -20,3 +20,5 @@ CREATE TABLE IF NOT EXISTS `%PRE%users_bak` ( `id` mediumint(9) NOT NULL auto_in
 CREATE TABLE IF NOT EXISTS `%PRE%user_packs_bak` (`id` mediumint(9) NOT NULL auto_increment, `userid` varchar(5) NOT NULL, `username` varchar(50) NOT NULL, `domain` varchar(50) NOT NULL, `pid` varchar(5) NOT NULL, `signup` varchar(20) NOT NULL, `status` varchar(1) NOT NULL, `additional` text NOT NULL, PRIMARY KEY  (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
 CREATE TABLE IF NOT EXISTS `%PRE%logs` (`id` mediumint(9) NOT NULL auto_increment, `uid` varchar(5) NOT NULL, `loguser` varchar(50) NOT NULL, `logtime` varchar(20) NOT NULL, `message` text NOT NULL, PRIMARY KEY  (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
 DELETE FROM `%PRE$acpnav` WHERE `id` = 17;
+UPDATE `%PRE%templates` SET  `description` =  'This is the email a client gets when they first go though the order form and complete it. This email should contain all they''re details.<br /><br />Template Variables:<br />%USER% - Client Username<br />%PASS% - Client Password<br />%EMAIL% - Client Email<br />%DOMAIN% - The clients package url<br />%PACKAGE% - The package the client signed up for' WHERE  `%PRE%templates`.`id` =3;
+UPDATE `%PRE%templates` SET  `description` =  'This is the email a client gets when they first go though the order form and complete it but are awaiting the admin. This email should contain all they''re details.<br /><br />Template Variables:<br />%USER% - Client Username<br />%PASS% - Client Password<br />%EMAIL% - Client Email<br />%DOMAIN% - The clients package url<br />%PACKAGE% - The package the client signed up for' WHERE  `%PRE%templates`.`id` =7;