Adding Textile and Markdown Extra options to a PunBB 1.2.17 forum
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
by Stef Dawson (http://stefdawson.com/)

===================
New database fields
===================

ALTER TABLE `pbb_users` ADD `markup_system` VARCHAR( 15 ) NOT NULL DEFAULT 'BBCode';

INSERT INTO `pbb_config` (
`conf_name` ,
`conf_value`
)
VALUES (
'p_message_textile', '0'
), (
'p_message_markdown', '0'
);

INSERT INTO `pbb_config` (
`conf_name` ,
`conf_value`
)
VALUES (
'p_sig_textile', '0'
), (
'p_sig_markdown', '0'
);

(you may optionally alter install.php to include the new fields too)


=======================
lang/English/common.php
=======================
Replace:
'img tag'				=>	'[img] tag',

With:
'Textile'				=>	'Textile',	// nor this
'Markdown'				=>	'Markdown Extra',	// nor this
'img tag'				=>	'image markup',


========================
lang/English/profile.php
========================
Find:
'Style info'				=>	'If you like you can use a different visual style for this forum.',

And add afterwards:
'Markup legend'				=>	'Select your preferred markup system',
'Markup info'				=>	'If you like you can use one of these systems to add markup to your posts.',


=====================
admin_permissions.php
=====================

Replace:
								<tr>
									<th scope="row">Image tag</th>
									<td>
										<input type="radio" name="form[message_img_tag]" value="1"<?php if ($pun_config['p_message_img_tag'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[message_img_tag]" value="0"<?php if ($pun_config['p_message_img_tag'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow the BBCode [img][/img] tag in posts.</span>
									</td>
								</tr>


With:
								<tr>
									<th scope="row">Textile</th>
									<td>
										<input type="radio" name="form[message_textile]" value="1"<?php if ($pun_config['p_message_textile'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[message_textile]" value="0"<?php if ($pun_config['p_message_textile'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow Textile in posts (optional).</span>
									</td>
								</tr>
								<tr>
									<th scope="row">Markdown</th>
									<td>
										<input type="radio" name="form[message_markdown]" value="1"<?php if ($pun_config['p_message_markdown'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[message_markdown]" value="0"<?php if ($pun_config['p_message_markdown'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow Markdown in posts (optional).</span>
									</td>
								</tr>
								<tr>
									<th scope="row">Image tag</th>
									<td>
										<input type="radio" name="form[message_img_tag]" value="1"<?php if ($pun_config['p_message_img_tag'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[message_img_tag]" value="0"<?php if ($pun_config['p_message_img_tag'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow images in posts.</span>
									</td>
								</tr>

Replace:
								<tr>
									<th scope="row">Image tag in signatures</th>
									<td>
										<input type="radio" name="form[sig_img_tag]" value="1"<?php if ($pun_config['p_sig_img_tag'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[sig_img_tag]" value="0"<?php if ($pun_config['p_sig_img_tag'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow the BBCode [img][/img] tag in user signatures (not recommended).</span>
									</td>
								</tr>

With:
								<tr>
									<th scope="row">Textile in signatures</th>
									<td>
										<input type="radio" name="form[sig_textile]" value="1"<?php if ($pun_config['p_sig_textile'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[sig_textile]" value="0"<?php if ($pun_config['p_sig_textile'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow Textile in user signatures.</span>
									</td>
								</tr>
								<tr>
									<th scope="row">Markdown in signatures</th>
									<td>
										<input type="radio" name="form[sig_markdown]" value="1"<?php if ($pun_config['p_sig_markdown'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[sig_markdown]" value="0"<?php if ($pun_config['p_sig_markdown'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow Markdown in user signatures.</span>
									</td>
								</tr>
								<tr>
									<th scope="row">Image tag in signatures</th>
									<td>
										<input type="radio" name="form[sig_img_tag]" value="1"<?php if ($pun_config['p_sig_img_tag'] == '1') echo ' checked="checked"' ?> />&nbsp;<strong>Yes</strong>&nbsp;&nbsp;&nbsp;<input type="radio" name="form[sig_img_tag]" value="0"<?php if ($pun_config['p_sig_img_tag'] == '0') echo ' checked="checked"' ?> />&nbsp;<strong>No</strong>
										<span>Allow images in user signatures (not recommended).</span>
									</td>
								</tr>


===========
profile.php
===========
Replace:
			// Validate BBCode syntax
			if ($pun_config['p_sig_bbcode'] == '1' && strpos($form['signature'], '[') !== false && strpos($form['signature'], ']') !== false)
			{
				require PUN_ROOT.'include/parser.php';
				$form['signature'] = preparse_bbcode($form['signature'], $foo, true);
			}

With:
			// Validate BBCode syntax
			if ($pun_config['p_sig_bbcode'] == '1' || $pun_config['p_sig_textile'] == '1' || $pun_config['p_sig_markdown'] == '1')
			{
				require PUN_ROOT.'include/parser.php';
			}
			if ($pun_config['p_sig_bbcode'] == '1' && strpos($form['signature'], '[') !== false && strpos($form['signature'], ']') !== false)
			{
				$form['signature'] = preparse_bbcode($form['signature'], $foo, true);
			}

A few lines later, replace:
			$form = extract_elements(array('disp_topics', 'disp_posts', 'show_smilies', 'show_img', 'show_img_sig', 'show_avatars', 'show_sig', 'style'));

With:
			$form = extract_elements(array('disp_topics', 'disp_posts', 'show_smilies', 'show_img', 'show_img_sig', 'show_avatars', 'show_sig', 'style', 'markup_system'));


About halfway down, find:

$result = $db->query('SELECT u.username, u.email, u.title, u.realname, u.url, u.jabber, u.icq, u.msn, u.aim, u.yahoo, u.location, u.use_avatar, u.signature, u.disp_topics, u.disp_posts, u.email_setting, u.save_pass, u.notify_with_post, u.show_smilies, u.show_img, u.show_img_sig, u.show_avatars, u.show_sig, u.timezone, u.language, u.style, u.num_posts, u.last_post, u.registered, u.registration_ip, u.admin_note, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id='.$id) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());

And replace with:

$result = $db->query('SELECT u.username, u.email, u.title, u.realname, u.url, u.jabber, u.icq, u.msn, u.aim, u.yahoo, u.location, u.use_avatar, u.signature, u.disp_topics, u.disp_posts, u.email_setting, u.save_pass, u.notify_with_post, u.show_smilies, u.show_img, u.show_img_sig, u.show_avatars, u.show_sig, u.timezone, u.language, u.style, u.markup_system, u.num_posts, u.last_post, u.registered, u.registration_ip, u.admin_note, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id='.$id) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());


Near the bottom, find:
								<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>

Replace with:
								<?php if ($pun_config['p_sig_textile'] == 1 && $user['markup_system'] == $lang_common['Textile']): ?>
								<li><a href="http://textile.thresholdstate.com/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Textile'] ?></a>: <?php echo ($pun_config['p_sig_textile'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
								<?php elseif ($pun_config['p_sig_markdown'] == 1 && $user['markup_system'] == $lang_common['Markdown']): ?>
								<li><a href="http://michelf.com/projects/php-markdown/extra/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Markdown'] ?></a>: <?php echo ($pun_config['p_sig_markdown'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
								<?php else: ?>
								<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
								<?php endif; ?>

A bit further on, find the post display legend:
				<div class="inform">
					<fieldset>
						<legend><?php echo $lang_profile['Post display legend'] ?></legend>

And immediately before it, insert this code:

<?php
		$markup = array();
		if ($pun_config['p_message_textile'] == 1) {
			$markup[] = $lang_common['Textile'];
		}
		if ($pun_config['p_message_markdown'] == 1) {
			$markup[] = $lang_common['Markdown'];
		}
		if ($pun_config['p_message_bbcode'] == 1) {
			$markup[] = $lang_common['BBCode'];
		}

		// Only display the markup selection box if there's more than one available
		if (count($markup) == 1)
			echo "\t\t\t".'<div><input type="hidden" name="form[markup]" value="'.$markup[0].'" /></div>'."\n";
		else if (count($markup) > 1)
		{
			natsort($markup);
?>
				<div class="inform">
					<fieldset>
						<legend><?php echo $lang_profile['Markup legend'] ?></legend>
						<div class="infldset">
							<label><?php echo $lang_profile['Markup info'] ?><br />
							<select name="form[markup_system]">
<?php

			while (list(, $temp) = @each($markup))
			{
				if ($user['markup_system'] == $temp)
					echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
				else
					echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
			}

?>
							</select>
							<br /></label>
						</div>
					</fieldset>
				</div>
<?php

		}

?>


===================
edit.php & post.php
===================

Replace:
	// Validate BBCode syntax
	if ($pun_config['p_message_bbcode'] == '1' && strpos($message, '[') !== false && strpos($message, ']') !== false)
	{
		require PUN_ROOT.'include/parser.php';
		$message = preparse_bbcode($message, $errors);
	}

With:
	// Validate BBCode syntax
	if ($pun_config['p_message_bbcode'] == '1' || $pun_config['p_message_textile'] == '1' || $pun_config['p_message_markdown'] == '1')
	{
		require PUN_ROOT.'include/parser.php';
	}
	if ($pun_config['p_message_bbcode'] == '1' && strpos($message, '[') !== false && strpos($message, ']') !== false)
	{
		$message = preparse_bbcode($message, $errors);
	}


And replace:
							<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>

With:
							<?php if ($pun_config['p_message_textile'] == 1 && $pun_user['markup_system'] == $lang_common['Textile']): ?>
							<li><a href="http://textile.thresholdstate.com/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Textile'] ?></a>: <?php echo ($pun_config['p_message_textile'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php elseif ($pun_config['p_message_markdown'] == 1 && $pun_user['markup_system'] == $lang_common['Markdown']): ?>
							<li><a href="http://michelf.com/projects/php-markdown/extra/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Markdown'] ?></a>: <?php echo ($pun_config['p_message_markdown'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php else: ?>
							<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php endif; ?>

Additionally, in post.php, find (about 2/3 of the way down):

		if ($pun_config['p_message_bbcode'] == '1')

Replace with:

		if ($pun_config['p_message_textile'] == '1' && $pun_user['markup_system'] == $lang_common['Textile'])
		{
			$quote = '*'.$q_poster.' '.$lang_common['wrote'].':*'."\n\n".'bq. '.$q_message."\n";
		}
		else if ($pun_config['p_message_markdown'] == '1' && $pun_user['markup_system'] == $lang_common['Markdown'])
		{
			$quote = '**'.$q_poster.' '.$lang_common['wrote'].':**'."\n\n".'> '.$q_message."\n";
		}
		else if ($pun_config['p_message_bbcode'] == '1' && $pun_user['markup_system'] == $lang_common['BBCode'])



=============
viewtopic.php
=============

Again, replace:
							<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>

With:
							<?php if ($pun_config['p_message_textile'] == 1 && $pun_user['markup_system'] == $lang_common['Textile']): ?>
							<li><a href="http://textile.thresholdstate.com/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Textile'] ?></a>: <?php echo ($pun_config['p_message_textile'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php elseif ($pun_config['p_message_markdown'] == 1 && $pun_user['markup_system'] == $lang_common['Markdown']): ?>
							<li><a href="http://michelf.com/projects/php-markdown/extra/" onclick="window.open(this.href); return false;"><?php echo $lang_common['Markdown'] ?></a>: <?php echo ($pun_config['p_message_markdown'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php else: ?>
							<li><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a>: <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></li>
							<?php endif; ?>


==================
include/common.php
==================
After the commonly used defines block (about line 89ish), Add:

if (!defined('PUN_PATH_TEXTILE'))
	define('PUN_PATH_TEXTILE', PUN_ROOT.'../textpattern/lib/');
if (!defined('PUN_PATH_MARKDOWN'))
	define('PUN_PATH_MARKDOWN', PUN_ROOT.'include/');

(obviously change these locations for your install!)


==================
include/parser.php
==================

Replace function handle_img_tag() with:

function handle_img_tag($url, $is_signature = false, $linkurl = false, $alttext = false)
{
	global $lang_common, $pun_config, $pun_user;

	$alttext = ($alttext) ? $alttext : $url;
	$img_tag = '<a href="'.$url.'">&lt;'.$lang_common['Image link'].'&gt;</a>';

	if ($is_signature && $pun_config['p_sig_img_tag'] == '1' && $pun_user['show_img_sig'] != '0')
		$img_tag = '<img class="sigimage" src="'.$url.'" alt="'.htmlspecialchars($alttext).'" />';
	else if (!$is_signature && $pun_config['p_message_img_tag'] == '1' && $pun_user['show_img'] != '0')
		$img_tag = '<img class="postimg" src="'.$url.'" alt="'.htmlspecialchars($alttext).'" />';

	if ($linkurl && substr($img_tag, 0, 4) == "<img")
		$img_tag = '<a href="'.$linkurl.'">'.$img_tag.'</a>';

	return $img_tag;
}

Replace function parse_message() with:

//
// Parse message text
//
function parse_message($text, $hide_smilies)
{
	global $pun_config, $lang_common, $pun_user;

	if ($pun_config['o_censoring'] == '1')
		$text = censor_words($text);

	if ($pun_config['p_message_textile'] == '1' && $pun_user['markup_system'] == $lang_common['Textile'])
	{
		include_once PUN_PATH_TEXTILE.'classTextile.php';

		// Replace (optionally anchored) images with links if necessary
		$text = preg_replace('#\!((ht|f)tps?://)([^\s<"]*?)\!\:((ht|f)tps?://)([^\s<"]*)#e', 'handle_img_tag(\'$1$3\', false, \'$4$6\')', $text);
		$text = preg_replace('#\!((ht|f)tps?://)([^\s<"]*?)\!#e', 'handle_img_tag(\'$1$3\')', $text);

		// Process textile - leave images on to preserve smilies and links to images from handle_img_tag()
		$textile = new Textile();
		$text = $textile->TextileThis($text);

		// Replace smilies
		if ($pun_config['o_smilies'] == '1' && $pun_user['show_smilies'] == '1' && $hide_smilies == '0')
			$text = do_smilies($text);
	}
	else if ($pun_config['p_message_markdown'] == '1' && $pun_user['markup_system'] == $lang_common['Markdown'])
	{
		include_once PUN_PATH_MARKDOWN.'markdown.php';

		// Replace any HTML tags so they are safe
		$text = preg_replace("/(<\/?\w+[^>]*>)/e", "stripslashes(pun_htmlspecialchars('\\1'))", $text);

		if ($pun_config['o_smilies'] == '1' && $pun_user['show_smilies'] == '1' && $hide_smilies == '0')
			$text = do_smilies($text);

		// Replace referenced, then standard images
		$text = preg_replace('#\!\[(.+)\]\s?\[(.+)\].*?\[\2\]\:\s?((ht|f)tps?://)([^\s<"]*)#es', 'handle_img_tag(\'$3$5\', true, false)', $text);
		$text = preg_replace('#\!\[(.+)\]\(((ht|f)tps?://)([^\)<]*?)\)#e', 'handle_img_tag(\'$2$4\', true, false, \'$1\')', $text);

		// Process markdown
		$text = Markdown($text);
	}
	else
	{
		// Assume BBCode
		// Convert applicable characters to HTML entities
		$text = pun_htmlspecialchars($text);

		// If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
		if (strpos($text, '[code]') !== false && strpos($text, '[/code]') !== false)
		{
			list($inside, $outside) = split_text($text, '[code]', '[/code]');
			$outside = array_map('ltrim', $outside);
			$text = implode('<">', $outside);
		}

		if ($pun_config['o_make_links'] == '1')
			$text = do_clickable($text);

		if ($pun_config['o_smilies'] == '1' && $pun_user['show_smilies'] == '1' && $hide_smilies == '0')
			$text = do_smilies($text);

		if ($pun_config['p_message_bbcode'] == '1' && strpos($text, '[') !== false && strpos($text, ']') !== false)
		{
			$text = do_bbcode($text);

			if ($pun_config['p_message_img_tag'] == '1')
			{
//				$text = preg_replace('#\[img\]((ht|f)tps?://)([^\s<"]*?)\.(jpg|jpeg|png|gif)\[/img\]#e', 'handle_img_tag(\'$1$3.$4\')', $text);
				$text = preg_replace('#\[img\]((ht|f)tps?://)([^\s<"]*?)\[/img\]#e', 'handle_img_tag(\'$1$3\')', $text);
			}
		}

		// Deal with newlines, tabs and multiple spaces
		$pattern = array("\n", "\t", '  ', '  ');
		$replace = array('<br />', '&nbsp; &nbsp; ', '&nbsp; ', ' &nbsp;');
		$text = str_replace($pattern, $replace, $text);

		// If we split up the message before we have to concatenate it together again (code tags)
		if (isset($inside))
		{
			$outside = explode('<">', $text);
			$text = '';

			$num_tokens = count($outside);

			for ($i = 0; $i < $num_tokens; ++$i)
			{
				$text .= $outside[$i];
				if (isset($inside[$i]))
				{
					$num_lines = ((substr_count($inside[$i], "\n")) + 3) * 1.5;
					$height_str = ($num_lines > 35) ? '35em' : $num_lines.'em';
					$text .= '</p><div class="codebox"><div class="incqbox"><h4>'.$lang_common['Code'].':</h4><div class="scrollbox" style="height: '.$height_str.'"><pre>'.$inside[$i].'</pre></div></div></div><p>';
				}
			}
		}

		// Add paragraph tag around post, but make sure there are no empty paragraphs
		$text = str_replace('<p></p>', '', '<p>'.$text.'</p>');
	}
	return $text;
}

Replace function parse_signature() with:

//
// Parse signature text
//
function parse_signature($text)
{
	global $pun_config, $lang_common, $pun_user;

	if ($pun_config['o_censoring'] == '1')
		$text = censor_words($text);

	if ($pun_config['p_sig_textile'] == '1' && $pun_user['markup_system'] == $lang_common['Textile'])
	{
		include_once PUN_PATH_TEXTILE.'classTextile.php';

		// Replace (optionally anchored) images with links if necessary
		$text = preg_replace('#\!((ht|f)tps?://)([^\s<"]*?)\!\:((ht|f)tps?://)([^\s<"]*)#e', 'handle_img_tag(\'$1$3\', true, \'$4$6\')', $text);
		$text = preg_replace('#\!((ht|f)tps?://)([^\s<"]*?)\!#e', 'handle_img_tag(\'$1$3\', true)', $text);

		// Process textile - leave images on here to preserve smilies and links to images from handle_img_tag()
		$textile = new Textile();
		$text = $textile->TextileThis($text);

		// Replace smilies
		if ($pun_config['o_smilies_sig'] == '1' && $pun_user['show_smilies'] != '0')
			$text = do_smilies($text);
	}
	else if ($pun_config['p_sig_markdown'] == '1' && $pun_user['markup_system'] == $lang_common['Markdown'])
	{
		include_once PUN_PATH_MARKDOWN.'markdown.php';

		// Replace any HTML tags so they are safe
		$text = preg_replace("/(<\/?\w+[^>]*>)/e", "stripslashes(pun_htmlspecialchars('\\1'))", $text);

		if ($pun_config['o_smilies_sig'] == '1' && $pun_user['show_smilies'] != '0')
			$text = do_smilies($text);

		// Replace referenced, then standard images
		$text = preg_replace('#\!\[(.+)\]\s?\[(.+)\].*?\[\2\]\:\s?((ht|f)tps?://)([^\s<"]*)#es', 'handle_img_tag(\'$3$5\', true, false)', $text);
		$text = preg_replace('#\!\[(.+)\]\(((ht|f)tps?://)([^\)<]*?)\)#e', 'handle_img_tag(\'$2$4\', true, false, \'$1\')', $text);

		// Process markdown
		$text = Markdown($text);
	}
	else
	{
		// Assume BBCode
		$text = pun_htmlspecialchars($text);

		if ($pun_config['o_make_links'] == '1')
			$text = do_clickable($text);

		if ($pun_config['o_smilies_sig'] == '1' && $pun_user['show_smilies'] != '0')
			$text = do_smilies($text);

		if ($pun_config['p_sig_bbcode'] == '1' && strpos($text, '[') !== false && strpos($text, ']') !== false)
		{
			$text = do_bbcode($text);

			if ($pun_config['p_sig_img_tag'] == '1')
			{
//				$text = preg_replace('#\[img\]((ht|f)tps?://)([^\s<"]*?)\.(jpg|jpeg|png|gif)\[/img\]#e', 'handle_img_tag(\'$1$3.$4\', true)', $text);
				$text = preg_replace('#\[img\]((ht|f)tps?://)([^\s<"]*?)\[/img\]#e', 'handle_img_tag(\'$1$3\', true)', $text);
			}
		}

		// Deal with newlines, tabs and multiple spaces
		$pattern = array("\n", "\t", '  ', '  ');
		$replace = array('<br />', '&nbsp; &nbsp; ', '&nbsp; ', ' &nbsp;');
		$text = str_replace($pattern, $replace, $text);
	}
	return $text;
}


=====================

Then install markdown.php (Markdown Extra in this case) and classTextile.php (if you're not pointing at the one in your TXP install)
in the locations you specified in include/common.php.

Job done! :-)