Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#855: escaping mails at display + #858: fixing scrollbar in Chrome #75

Merged
merged 10 commits into from May 21, 2013
Merged

#855: escaping mails at display + #858: fixing scrollbar in Chrome #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6e9efba
#855 Escaping admin's mail
adaur May 17, 2013
dfe8ca4
#855 Escaping email when displaying
adaur May 17, 2013
58dff0d
#855 Escaping admin's mail
adaur May 17, 2013
5ec12a0
#855 Escaping admin's mail
adaur May 17, 2013
6860b21
#855 Escaping email when displaying
adaur May 17, 2013
ed40a5f
#855 Escaping email when displaying
adaur May 17, 2013
f559fb4
#855 Escaping email when displaying
adaur May 17, 2013
078de81
#858: Fixed scrollbar in Google Chrome
adaur May 20, 2013
eb08996
#858: Fixed scrollbar in Google Chrome
adaur May 20, 2013
69cdd6b
#858: Fixed scrollbar in Google Chrome
adaur May 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion login.php
View file
Open in desktop
Expand Up @@ -168,7 +168,7 @@
pun_mail($email, $mail_subject, $cur_mail_message);
}

message($lang_login['Forget mail'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.', true);
message($lang_login['Forget mail'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.', true);
}
else
$errors[] = $lang_login['No email match'].' '.htmlspecialchars($email).'.';
Expand Down
14 changes: 7 additions & 7 deletions profile.php
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@
$cur_user = $db->fetch_assoc($result);

if ($key == '' || $key != $cur_user['activate_key'])
message($lang_profile['Pass key bad'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.');
message($lang_profile['Pass key bad'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.');
else
{
$db->query('UPDATE '.$db->prefix.'users SET password=\''.$cur_user['activate_string'].'\', activate_string=NULL, activate_key=NULL'.(!empty($cur_user['salt']) ? ', salt=NULL' : '').' WHERE id='.$id) or error('Unable to update password', __FILE__, __LINE__, $db->error());
Expand Down Expand Up @@ -183,7 +183,7 @@
list($new_email, $new_email_key) = $db->fetch_row($result);

if ($key == '' || $key != $new_email_key)
message($lang_profile['Email key bad'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.');
message($lang_profile['Email key bad'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.');
else
{
$db->query('UPDATE '.$db->prefix.'users SET email=activate_string, activate_string=NULL, activate_key=NULL WHERE id='.$id) or error('Unable to update email address', __FILE__, __LINE__, $db->error());
Expand Down Expand Up @@ -275,7 +275,7 @@

pun_mail($new_email, $mail_subject, $mail_message);

message($lang_profile['Activate email sent'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.', true);
message($lang_profile['Activate email sent'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.', true);
}

$page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_common['Profile'], $lang_profile['Change email']);
Expand Down Expand Up @@ -368,7 +368,7 @@

// Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
if (!@move_uploaded_file($uploaded_file['tmp_name'], PUN_ROOT.$pun_config['o_avatars_dir'].'/'.$id.'.tmp'))
message($lang_profile['Move failed'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.');
message($lang_profile['Move failed'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.');

list($width, $height, $type,) = @getimagesize(PUN_ROOT.$pun_config['o_avatars_dir'].'/'.$id.'.tmp');

Expand Down Expand Up @@ -1068,7 +1068,7 @@
}

if ($user['email_setting'] == '0' && !$pun_user['is_guest'] && $pun_user['g_send_email'] == '1')
$email_field = '<a href="mailto:'.$user['email'].'">'.$user['email'].'</a>';
$email_field = '<a href="mailto:'.pun_htmlspecialchars($user['email']).'">'.pun_htmlspecialchars($user['email']).'</a>';
else if ($user['email_setting'] == '1' && !$pun_user['is_guest'] && $pun_user['g_send_email'] == '1')
$email_field = '<a href="misc.php?email='.$id.'">'.$lang_common['Send email'].'</a>';
else
Expand Down Expand Up @@ -1239,14 +1239,14 @@
else
$username_field = '<p>'.sprintf($lang_profile['Username info'], pun_htmlspecialchars($user['username'])).'</p>'."\n";

$email_field = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="misc.php?email='.$id.'">'.$lang_common['Send email'].'</a></span></p>'."\n";
$email_field = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.pun_htmlspecialchars($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="misc.php?email='.$id.'">'.$lang_common['Send email'].'</a></span></p>'."\n";
}
else
{
$username_field = '<p>'.$lang_common['Username'].': '.pun_htmlspecialchars($user['username']).'</p>'."\n";

if ($pun_config['o_regs_verify'] == '1')
$email_field = '<p>'.sprintf($lang_profile['Email info'], $user['email'].' - <a href="profile.php?action=change_email&amp;id='.$id.'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
$email_field = '<p>'.sprintf($lang_profile['Email info'], pun_htmlspecialchars($user['email']).' - <a href="profile.php?action=change_email&amp;id='.$id.'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
else
$email_field = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
}
Expand Down
2 changes: 1 addition & 1 deletion register.php
View file
Open in desktop
Expand Up @@ -240,7 +240,7 @@

pun_mail($email1, $mail_subject, $mail_message);

message($lang_register['Reg email'].' <a href="mailto:'.$pun_config['o_admin_email'].'">'.$pun_config['o_admin_email'].'</a>.', true);
message($lang_register['Reg email'].' <a href="mailto:'.pun_htmlspecialchars($pun_config['o_admin_email']).'">'.pun_htmlspecialchars($pun_config['o_admin_email']).'</a>.', true);
}

// Regenerate the users info cache
Expand Down
3 changes: 1 addition & 2 deletions style/Air.css
View file
Open in desktop
Expand Up @@ -964,8 +964,7 @@ MAIN POSTS
}

.pun .codebox pre {
overflow-y:hidden;
overflow: auto;
overflow: hidden;
width: 100%;
direction: ltr;
text-align: left;
Expand Down
3 changes: 1 addition & 2 deletions style/Earth.css
View file
Open in desktop
Expand Up @@ -963,8 +963,7 @@ MAIN POSTS
}

.pun .codebox pre {
overflow-y:hidden;
overflow: auto;
overflow: hidden;
width: 100%;
direction: ltr;
text-align: left;
Expand Down
3 changes: 1 addition & 2 deletions style/Fire.css
View file
Open in desktop
Expand Up @@ -963,8 +963,7 @@ MAIN POSTS
}

.pun .codebox pre {
overflow-y:hidden;
overflow: auto;
overflow: hidden;
width: 100%;
direction: ltr;
text-align: left;
Expand Down
4 changes: 2 additions & 2 deletions viewtopic.php
View file
Open in desktop
Expand Up @@ -262,7 +262,7 @@

// Now let's deal with the contact links (Email and URL)
if ((($cur_post['email_setting'] == '0' && !$pun_user['is_guest']) || $pun_user['is_admmod']) && $pun_user['g_send_email'] == '1')
$user_contacts[] = '<span class="email"><a href="mailto:'.$cur_post['email'].'">'.$lang_common['Email'].'</a></span>';
$user_contacts[] = '<span class="email"><a href="mailto:'.pun_htmlspecialchars($cur_post['email']).'">'.$lang_common['Email'].'</a></span>';
else if ($cur_post['email_setting'] == '1' && !$pun_user['is_guest'] && $pun_user['g_send_email'] == '1')
$user_contacts[] = '<span class="email"><a href="misc.php?email='.$cur_post['poster_id'].'">'.$lang_common['Email'].'</a></span>';

Expand Down Expand Up @@ -293,7 +293,7 @@
$user_info[] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.pun_htmlspecialchars($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';

if ($pun_config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$pun_user['is_guest'] && $pun_user['g_send_email'] == '1')
$user_contacts[] = '<span class="email"><a href="mailto:'.$cur_post['poster_email'].'">'.$lang_common['Email'].'</a></span>';
$user_contacts[] = '<span class="email"><a href="mailto:'.pun_htmlspecialchars($cur_post['poster_email']).'">'.$lang_common['Email'].'</a></span>';
}

// Generation post action array (quote, edit, delete etc.)
Expand Down