mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Some sig preview issues ... I'll finish this UCP stuff at some point soon ... honest
git-svn-id: file:///svn/phpbb/trunk@4470 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ecc9b5eb41
commit
baca8d3221
1 changed files with 18 additions and 16 deletions
|
@ -3,8 +3,8 @@
|
||||||
//
|
//
|
||||||
// $Id$
|
// $Id$
|
||||||
//
|
//
|
||||||
// FILENAME : admin_styles.php
|
// FILENAME : ucp_profile.php
|
||||||
// STARTED : Thu Aug 7 2003
|
// STARTED : Mon May 19, 2003
|
||||||
// COPYRIGHT : © 2003 phpBB Group
|
// COPYRIGHT : © 2003 phpBB Group
|
||||||
// WWW : http://www.phpbb.com/
|
// WWW : http://www.phpbb.com/
|
||||||
// LICENCE : GPL vs2.0 [ see /docs/COPYING ]
|
// LICENCE : GPL vs2.0 [ see /docs/COPYING ]
|
||||||
|
@ -21,7 +21,9 @@ class ucp_profile extends ucp
|
||||||
global $censors, $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx;
|
global $censors, $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx;
|
||||||
|
|
||||||
$submode = (isset($_GET['mode'])) ? htmlspecialchars($_GET['mode']) : 'reg_details';
|
$submode = (isset($_GET['mode'])) ? htmlspecialchars($_GET['mode']) : 'reg_details';
|
||||||
$error = '';
|
$preview = (isset($_POST['preview'])) ? true : false;
|
||||||
|
$submit = (isset($_POST['submit'])) ? true : false;
|
||||||
|
$error = array();
|
||||||
|
|
||||||
$submodules['REG_DETAILS'] = "i=$id&mode=reg_details";
|
$submodules['REG_DETAILS'] = "i=$id&mode=reg_details";
|
||||||
$submodules['PROFILE_INFO'] = "i=$id&mode=profile_info";
|
$submodules['PROFILE_INFO'] = "i=$id&mode=profile_info";
|
||||||
|
@ -243,10 +245,9 @@ class ucp_profile extends ucp
|
||||||
$enable_urls = (isset($_POST['disable_magic_url'])) ? !$_POST['disable_magic_url'] : 1;
|
$enable_urls = (isset($_POST['disable_magic_url'])) ? !$_POST['disable_magic_url'] : 1;
|
||||||
|
|
||||||
decode_text($user->data['user_sig'], $user->data['user_sig_bbcode_uid']);
|
decode_text($user->data['user_sig'], $user->data['user_sig_bbcode_uid']);
|
||||||
$signature = (!empty($_POST['signature'])) ? htmlspecialchars($_POST['signature']) : $user->data['user_sig'];
|
$signature = (isset($_POST['signature'])) ? stripslashes(htmlspecialchars(trim($_POST['signature']))) : $user->data['user_sig'];
|
||||||
|
|
||||||
$error = array();
|
if ($submit)
|
||||||
if ($_POST['submit'])
|
|
||||||
{
|
{
|
||||||
if (strlen($signature) > $config['max_sig_chars'])
|
if (strlen($signature) > $config['max_sig_chars'])
|
||||||
{
|
{
|
||||||
|
@ -258,9 +259,9 @@ class ucp_profile extends ucp
|
||||||
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
|
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
|
||||||
|
|
||||||
$message_parser = new parse_message();
|
$message_parser = new parse_message();
|
||||||
$message_parser->message = trim(stripslashes($signature));
|
$message_parser->message = $signature;
|
||||||
$message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
|
$message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
|
||||||
$signature = $message_parser->message;
|
echo ">>" . $signature = $message_parser->message;
|
||||||
|
|
||||||
$sql_ary = array(
|
$sql_ary = array(
|
||||||
'user_sig' => $signature,
|
'user_sig' => $signature,
|
||||||
|
@ -268,7 +269,7 @@ class ucp_profile extends ucp
|
||||||
'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield
|
'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield
|
||||||
);
|
);
|
||||||
|
|
||||||
$sql = 'UPDATE ' . USERS_TABLE . '
|
echo $sql = 'UPDATE ' . USERS_TABLE . '
|
||||||
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
|
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
|
||||||
WHERE user_id = ' . $user->data['user_id'];
|
WHERE user_id = ' . $user->data['user_id'];
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
@ -276,18 +277,20 @@ class ucp_profile extends ucp
|
||||||
$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&i=$id&mode=$submode\">", '</a>');
|
$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&i=$id&mode=$submode\">", '</a>');
|
||||||
trigger_error($message);
|
trigger_error($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$signature = stripslashes($signature);
|
||||||
}
|
}
|
||||||
|
|
||||||
$signature_preview = '';
|
$signature_preview = '';
|
||||||
if ($_POST['preview'])
|
if ($preview)
|
||||||
{
|
{
|
||||||
|
$signature_preview = $signature;
|
||||||
|
|
||||||
// Fudge-o-rama ...
|
// Fudge-o-rama ...
|
||||||
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
|
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
|
||||||
|
|
||||||
$signature_preview = $signature;
|
|
||||||
|
|
||||||
$message_parser = new parse_message();
|
$message_parser = new parse_message();
|
||||||
$message_parser->message = trim(stripslashes($signature_preview));
|
$message_parser->message = $signature_preview;
|
||||||
$message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
|
$message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
|
||||||
$signature_preview = $message_parser->message;
|
$signature_preview = $message_parser->message;
|
||||||
|
|
||||||
|
@ -297,9 +300,10 @@ class ucp_profile extends ucp
|
||||||
$bbcode = new bbcode($message_parser->bbcode_bitfield);
|
$bbcode = new bbcode($message_parser->bbcode_bitfield);
|
||||||
|
|
||||||
// Second parse bbcode here
|
// Second parse bbcode here
|
||||||
$signature_preview = $bbcode->bbcode_second_pass($signature_preview, $message_parser->bbcode_uid);
|
$bbcode->bbcode_second_pass($signature_preview, $message_parser->bbcode_uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// If we allow users to disable display of emoticons
|
// If we allow users to disable display of emoticons
|
||||||
// we'll need an appropriate check and preg_replace here
|
// we'll need an appropriate check and preg_replace here
|
||||||
$signature_preview = (empty($enable_smilies) || empty($config['allow_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $signature_preview) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $signature_preview);
|
$signature_preview = (empty($enable_smilies) || empty($config['allow_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $signature_preview) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $signature_preview);
|
||||||
|
@ -318,8 +322,6 @@ class ucp_profile extends ucp
|
||||||
'SIGNATURE' => $signature,
|
'SIGNATURE' => $signature,
|
||||||
'SIGNATURE_PREVIEW' => $signature_preview,
|
'SIGNATURE_PREVIEW' => $signature_preview,
|
||||||
|
|
||||||
'S_SIGNATURE_PREVIEW' => ($signature_preview) ? true : false,
|
|
||||||
|
|
||||||
'S_HTML_CHECKED' => (!$enable_html) ? 'checked="checked"' : '',
|
'S_HTML_CHECKED' => (!$enable_html) ? 'checked="checked"' : '',
|
||||||
'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '',
|
'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '',
|
||||||
'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '',
|
'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '',
|
||||||
|
|
Loading…
Add table
Reference in a new issue