mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 05:31:58 +02:00
Code Issues Releases Wiki Activity

fixed #14

Browse Source 
Various minor system bugfixes and enhancements
This commit is contained in:
SecretR 2012-12-11 18:44:34 +02:00
parent deafa2812f
commit 5aad9b6553
5 changed files with 652 additions and 1968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2592
e107_admin/users.php
View File

File diff suppressed because it is too large Load Diff

2
e107_handlers/form_handler.php
View File

@ -217,7 +217,7 @@ class e_form
if(!vartrue($parms['size'])) $parms['size'] = 15;
if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner input-small';
if(!$value) $value = '0';
return $this->text(vartrue($key), $value, $maxlength, $parms);
return $this->text($name, $value, $maxlength, $parms);
}
function email($name, $value, $maxlength = 200, $options = array())

9
e107_handlers/user_model.php
View File

@ -1239,6 +1239,15 @@ class e_system_user extends e_user_model
$search[7] = '{PASSWORD}';
$replace[7] = $pass_show ? $pass_show : '******';
if(isset($userInfo['activation_url']))
{
$search[8] = '{ACTIVATION_URL}';
$replace[8] = $userInfo['activation_url'];
$search[9] = '{ACTIVATION_LINK}';
$replace[9] = strpos($userInfo['activation_url'], 'http') === 0 ? '<a href="'.$userInfo['url_activate'].'">'.$userInfo['activation_url'].'</a>' : $userInfo['activation_url'];
}
$ret['send_html'] = TRUE;
$ret['mail_body'] = e107::getParser()->parseTemplate(str_replace($search, $replace, $template));
$ret['preview'] = $ret['mail_body']; // Non-standard field

7
e107_languages/English/admin/lan_users.php
View File

@ -183,13 +183,12 @@ define('USRLAN_175', '');
define('USRLAN_179', 'User banned: ');
define('USRLAN_180', 'IP address of {IP} appears on whitelist; IP not banned.');
define('USRLAN_181', 'Send confirmation email with password to new user');
define('USRLAN_181', 'Choose option for user status and sending confirmation email to the user');
define('USRLAN_182', 'Invalid characters in login name'); // duplicate - USRLAN_92, used for 'verify' user action
define('USRLAN_183', 'That login name already in use'); // wrong used with 'reqverify' user action
define('USRLAN_184', 'Length of login name outside limits');
define('USRLAN_185', 'A user account has been created for you at {SITEURL} with the following login:<br />Login Name: {LOGINNAME}<br />Password: {PASSWORD}<br/><br />');
define('USRLAN_186', 'Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.<br /><br />
You can also change other settings at the same time.<br /><br />Note that your password cannot be recovered if you lose it.');
define('USRLAN_185', 'A user account has been created for you at {SITEURL} with the following login:<br /><br /><b>Login Name:</b> {LOGINNAME}<br /><b>Password:</b> {PASSWORD}<br/><b>Activation link:</b> {ACTIVATION_LINK}<br /><br />');
define('USRLAN_186', 'Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.<br /><br />You can also change other settings at the same time.<br /><br />Note that your password cannot be recovered if you lose it.');
define('USRLAN_187', 'Access to website: ');
define('USRLAN_188', 'Email sent successfully');
define('USRLAN_189', 'Error sending email');

10
e107_themes/templates/email_template.php
View File

@ -53,7 +53,7 @@ $EMAIL_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://ww
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
</head>
<body>
<div style='padding:10px'>
<div style='padding:0px 10px'>
";
@ -78,7 +78,7 @@ $MAILOUT_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
</head>
<body>
<div style='padding:10px'>
<div style='padding:0px 10px'>
";
/**
@ -102,7 +102,7 @@ $NOTIFY_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://w
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
</head>
<body>
<div style='padding:10px'>
<div style='padding:0px 10px'>
";
/**
@ -120,7 +120,7 @@ $NOTIFY_FOOTER = "
* SIGNUP EMAIL TEMPLATE - BODY.
*/
$SIGNUPEMAIL_TEMPLATE = "
<div style='padding:10px'>
<div style='padding:0px 10px'>
<div style='text-align:left; width:90%'>
".LAN_EMAIL_01." {USERNAME},<br />
<br />".
@ -157,7 +157,7 @@ LAN_SIGNUP_97." {SITENAME}<br />
You can also change other settings at the same time.<br /><br />Note that your password cannot be recovered if you lose it.
*/
$QUICKADDUSER_TEMPLATE = "<div style='padding:10px'>".USRLAN_185.USRLAN_186."</div>";
$QUICKADDUSER_TEMPLATE = "<div>".USRLAN_185.USRLAN_186."</div>";
?>