PunBB 1.1 to 1.1.3 Changes

PunBB 1.1 to 1.1.3 Changes	Legend
	Lines removed
	Lines changed
		Lines added

punbb-1.1/upload/admin_bans.php	punbb-1.1.3/upload/admin_bans.php
54: }	54: }
55: else // Otherwise the username is in POST	55: else // Otherwise the username is in POST
56: {	56: {
57: $ban_user = trim(strtolower($_POST['new_ban_user']));	57: $ban_user = trim($_POST['new_ban_user']);
58:	58:
59: if ($ban_user != '')	59: if ($ban_user != '')
60: {	60: {
121: <td class="puncon2">	121: <td class="puncon2">
122: <table class="punplain" cellpadding="6">	122: <table class="punplain" cellpadding="6">
123: <tr>	123: <tr>
124: <td class="punright" style="width: 35%"><b>Username</b><br>The username to ban (case insensitive).</td>	124: <td class="punright" style="width: 35%"><b>Username</b><br>The username to ban.</td>
125: <td style="width: 35%"><input type="text" name="ban_user" size="25" maxlength="25" value="<?php echo $ban_user ?>" tabindex="1"></td>	125: <td style="width: 35%"><input type="text" name="ban_user" size="25" maxlength="25" value="<?php echo $ban_user ?>" tabindex="1"></td>
126: </tr>	126: </tr>
127: <tr>	127: <tr>

punbb-1.1/upload/admin_index.php	punbb-1.1.3/upload/admin_index.php
67:	67:
68:	68:
69: // Get the server load averages (if possible)	69: // Get the server load averages (if possible)
70: if (file_exists('/proc/loadavg'))	70: if (@file_exists('/proc/loadavg'))
71: {	71: {
72: // We use @ just in case	72: // We use @ just in case
73: $fh = @fopen('/proc/loadavg', 'r');	73: $fh = @fopen('/proc/loadavg', 'r');
81: $server_load = $load_averages[1].' '.$load_averages[2].' '.$load_averages[3];	81: $server_load = $load_averages[1].' '.$load_averages[2].' '.$load_averages[3];
82: else	82: else
83: $server_load = 'Not available';	83: $server_load = 'Not available';
84:	84:
85:	85:
86: // Get number of current visitors	86: // Get number of current visitors
87: $result = $db->query('SELECT COUNT(user_id) FROM '.$db->prefix.'online') or error('Unable to fetch online count', __FILE__, __LINE__, $db->error());	87: $result = $db->query('SELECT COUNT(user_id) FROM '.$db->prefix.'online') or error('Unable to fetch online count', __FILE__, __LINE__, $db->error());

punbb-1.1/upload/admin_maintenance.php	punbb-1.1.3/upload/admin_maintenance.php
42: if (empty($per_page) \|\| empty($start_at))	42: if (empty($per_page) \|\| empty($start_at))
43: message($lang_common['Bad request']);	43: message($lang_common['Bad request']);
44:	44:
	45: @set_time_limit(0);
	46:
45: // If this is the first cycle of posts we empty the search index before we proceed	47: // If this is the first cycle of posts we empty the search index before we proceed
46: if (isset($_GET['empty_index']))	48: if (isset($_GET['empty_index']))
47: {	49: {
115: else	117: else
116: {	118: {
117: // Get the first post ID from the db	119: // Get the first post ID from the db
118: $result = $db->query('SELECT id FROM '.$db->prefix.'topics ORDER BY id LIMIT 1') or error('Unable to create category', __FILE__, __LINE__, $db->error());	120: $result = $db->query('SELECT id FROM '.$db->prefix.'topics ORDER BY id LIMIT 1') or error('Unable to fetch topic info', __FILE__, __LINE__, $db->error());
119: if ($db->num_rows($result))	121: if ($db->num_rows($result))
120: $first_id = $db->result($result, 0);	122: $first_id = $db->result($result, 0);
121:	123:

punbb-1.1/upload/admin_options.php	punbb-1.1.3/upload/admin_options.php
94: $form['maintenance'] = '0';	94: $form['maintenance'] = '0';
95: }	95: }
96:	96:
	97: $form['timeout_visit'] = intval($form['timeout_visit']);
	98: $form['timeout_online'] = intval($form['timeout_online']);
	99: $form['redirect_delay'] = intval($form['redirect_delay']);
	100: $form['flood_interval'] = intval($form['flood_interval']);
	101: $form['topic_review'] = intval($form['topic_review']);
	102: $form['disp_topics_default'] = intval($form['disp_topics_default']);
	103: $form['disp_posts_default'] = intval($form['disp_posts_default']);
	104: $form['indent_num_spaces'] = intval($form['indent_num_spaces']);
	105: $form['avatars_width'] = intval($form['avatars_width']);
	106: $form['avatars_height'] = intval($form['avatars_height']);
	107: $form['avatars_size'] = intval($form['avatars_size']);
97:	108:
98: while (list($key, $input) = @each($form))	109: while (list($key, $input) = @each($form))
99: {	110: {
100: // Only update values that have changed	111: // Only update values that have changed
101: if ($pun_config['o_'.$key] != $input)	112: if ($pun_config['o_'.$key] != $input)
102: {	113: {
103: if ($input != '')	114: if ($input != '' \|\| is_int($input))
104: $value = '\''.escape($input).'\'';	115: $value = '\''.escape($input).'\'';
105: else	116: else
106: $value = 'NULL';	117: $value = 'NULL';
392: </tr>	403: </tr>
393: <tr>	404: <tr>
394: <td class="punright" style="width: 35%"><b>SMTP username</b><br>Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <b>don't</b> require authentication).</td>	405: <td class="punright" style="width: 35%"><b>SMTP username</b><br>Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <b>don't</b> require authentication).</td>
395: <td style="width: 65%"><input type="text" name="form[smtp_user]" size="25" maxlength="25" value="<?php echo $pun_config['o_smtp_user'] ?>"></td>	406: <td style="width: 65%"><input type="text" name="form[smtp_user]" size="25" maxlength="50" value="<?php echo $pun_config['o_smtp_user'] ?>"></td>
396: </tr>	407: </tr>
397: <tr>	408: <tr>
398: <td class="punright" style="width: 35%"><b>SMTP password</b><br>Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <b>don't</b> require authentication).</td>	409: <td class="punright" style="width: 35%"><b>SMTP password</b><br>Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <b>don't</b> require authentication).</td>
399: <td style="width: 65%"><input type="text" name="form[smtp_pass]" size="25" maxlength="25" value="<?php echo $pun_config['o_smtp_pass'] ?>"></td>	410: <td style="width: 65%"><input type="text" name="form[smtp_pass]" size="25" maxlength="50" value="<?php echo $pun_config['o_smtp_pass'] ?>"></td>
400: </tr>	411: </tr>
401: </table>	412: </table>
402: </td>	413: </td>

punbb-1.1/upload/admin_permissions.php	punbb-1.1.3/upload/admin_permissions.php
38:	38:
39: $form = array_map('trim', $_POST['form']);	39: $form = array_map('trim', $_POST['form']);
40:	40:
	41: $form['sig_length'] = intval($form['sig_length']);
	42: $form['sig_lines'] = intval($form['sig_lines']);
	43:
41: while (list($key, $input) = @each($form))	44: while (list($key, $input) = @each($form))
42: {	45: {
43: // Only update values that have changed	46: // Only update values that have changed
44: if ($pun_config['p_'.$key] != $input)	47: if ($pun_config['p_'.$key] != $input)
45: {	48: {
46: if ($input != '')	49: if ($input != '' \|\| is_int($input))
47: $value = '\''.escape($input).'\'';	50: $value = '\''.escape($input).'\'';
48: else	51: else
49: $value = 'NULL';	52: $value = 'NULL';

punbb-1.1/upload/admin_prune.php	punbb-1.1.3/upload/admin_prune.php
87: $prune_from = $_POST['prune_from'];	87: $prune_from = $_POST['prune_from'];
88:	88:
89: // Concatenate together the query for counting number or topics to prune	89: // Concatenate together the query for counting number or topics to prune
90: $sql = 'SELECT COUNT(id) FROM '.$db->prefix.'topics WHERE last_post<'.$prune_date;	90: $sql = 'SELECT COUNT(id) FROM '.$db->prefix.'topics WHERE last_post<'.$prune_date.' AND moved_to IS NULL';
91:	91:
92: if ($_POST['prune_sticky'] == '0')	92: if ($_POST['prune_sticky'] == '0')
93: $sql .= ' AND sticky=\'0\'';	93: $sql .= ' AND sticky=\'0\'';
98:	98:
99: // Fetch the forum name (just for cosmetic reasons)	99: // Fetch the forum name (just for cosmetic reasons)
100: $result = $db->query('SELECT forum_name FROM '.$db->prefix.'forums WHERE id='.$prune_from) or error('Unable to fetch forum name', __FILE__, __LINE__, $db->error());	100: $result = $db->query('SELECT forum_name FROM '.$db->prefix.'forums WHERE id='.$prune_from) or error('Unable to fetch forum name', __FILE__, __LINE__, $db->error());
101: $forum = '"'.$db->result($result, 0).'"';	101: $forum = '"'.pun_htmlspecialchars($db->result($result, 0)).'"';
102: }	102: }
103: else	103: else
104: $forum = 'all forums';	104: $forum = 'all forums';

punbb-1.1/upload/admin_users.php	punbb-1.1.3/upload/admin_users.php
362: <tr>	362: <tr>
363: <td class="punright" style="width: 35%">Username</td>	363: <td class="punright" style="width: 35%">Username</td>
364: <td style="width: 35%"><input type="text" name="username" size="25" maxlength="25" tabindex="1"></td>	364: <td style="width: 35%"><input type="text" name="username" size="25" maxlength="25" tabindex="1"></td>
365: <td style="width: 30%" rowspan="16"><input type="submit" name="find_user" value=" Find " tabindex="21"></td>	365: <td style="width: 30%" rowspan="16"><input type="submit" name="find_user" value=" Find " tabindex="22"></td>
366: </tr>	366: </tr>
367: <tr>	367: <tr>
368: <td class="punright" style="width: 35%">E-mail address</td>	368: <td class="punright" style="width: 35%">E-mail address</td>
385: <td style="width: 35%"><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="6"></td>	385: <td style="width: 35%"><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="6"></td>
386: </tr>	386: </tr>
387: <tr>	387: <tr>
	388: <td class="punright" style="width: 35%">MSN Messenger</td>
	389: <td style="width: 35%"><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="7"></td>
	390: </tr>
	391: <tr>
388: <td class="punright" style="width: 35%">AOL IM</td>	392: <td class="punright" style="width: 35%">AOL IM</td>
389: <td style="width: 35%"><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="7"></td>	393: <td style="width: 35%"><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="8"></td>
390: </tr>	394: </tr>
391: <tr>	395: <tr>
392: <td class="punright" style="width: 35%">Yahoo! Messenger</td>	396: <td class="punright" style="width: 35%">Yahoo! Messenger</td>
393: <td style="width: 35%"><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="8"></td>	397: <td style="width: 35%"><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="9"></td>
394: </tr>	398: </tr>
395: <tr>	399: <tr>
396: <td class="punright" style="width: 35%">Location</td>	400: <td class="punright" style="width: 35%">Location</td>
397: <td style="width: 35%"><input type="text" name="form[location]" size="30" maxlength="30" tabindex="9"></td>	401: <td style="width: 35%"><input type="text" name="form[location]" size="30" maxlength="30" tabindex="10"></td>
398: </tr>	402: </tr>
399: <tr>	403: <tr>
400: <td class="punright" style="width: 35%">Signature</td>	404: <td class="punright" style="width: 35%">Signature</td>
401: <td style="width: 35%"><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="10"></td>	405: <td style="width: 35%"><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="11"></td>
402: </tr>	406: </tr>
403: <tr>	407: <tr>
404: <td class="punright" style="width: 35%">Admin note</td>	408: <td class="punright" style="width: 35%">Admin note</td>
405: <td style="width: 35%"><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="11"></td>	409: <td style="width: 35%"><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="12"></td>
406: </tr>	410: </tr>
407: <tr>	411: <tr>
408: <td class="punright" style="width: 35%">Number of posts greater than</td>	412: <td class="punright" style="width: 35%">Number of posts greater than</td>
409: <td style="width: 35%"><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="12"></td>	413: <td style="width: 35%"><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="13"></td>
410: </tr>	414: </tr>
411: <tr>	415: <tr>
412: <td class="punright" style="width: 35%">Number of posts less than</td>	416: <td class="punright" style="width: 35%">Number of posts less than</td>
413: <td style="width: 35%"><input type="text" name="posts_less" size="5" maxlength="8" tabindex="13"></td>	417: <td style="width: 35%"><input type="text" name="posts_less" size="5" maxlength="8" tabindex="14"></td>
414: </tr>	418: </tr>
415: <tr>	419: <tr>
416: <td class="punright" style="width: 35%">Last post is after<br>(yyyy-mm-dd hh:mm:ss)</td>	420: <td class="punright" style="width: 35%">Last post is after<br>(yyyy-mm-dd hh:mm:ss)</td>
417: <td style="width: 35%"><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="14"></td>	421: <td style="width: 35%"><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="15"></td>
418: </tr>	422: </tr>
419: <tr>	423: <tr>
420: <td class="punright" style="width: 35%">Last post is before<br>(yyyy-mm-dd hh:mm:ss)</td>	424: <td class="punright" style="width: 35%">Last post is before<br>(yyyy-mm-dd hh:mm:ss)</td>
421: <td style="width: 35%"><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="15"></td>	425: <td style="width: 35%"><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="16"></td>
422: </tr>	426: </tr>
423: <tr>	427: <tr>
424: <td class="punright" style="width: 35%">Registered after<br>(yyyy-mm-dd hh:mm:ss)</td>	428: <td class="punright" style="width: 35%">Registered after<br>(yyyy-mm-dd hh:mm:ss)</td>
425: <td style="width: 35%"><input type="text" name="registered_after" size="24" maxlength="19" tabindex="16"></td>	429: <td style="width: 35%"><input type="text" name="registered_after" size="24" maxlength="19" tabindex="17"></td>
426: </tr>	430: </tr>
427: <tr>	431: <tr>
428: <td class="punright" style="width: 35%">Registered before<br>(yyyy-mm-dd hh:mm:ss)</td>	432: <td class="punright" style="width: 35%">Registered before<br>(yyyy-mm-dd hh:mm:ss)</td>
429: <td style="width: 35%"><input type="text" name="registered_before" size="24" maxlength="19" tabindex="17"></td>	433: <td style="width: 35%"><input type="text" name="registered_before" size="24" maxlength="19" tabindex="18"></td>
430: </tr>	434: </tr>
431: <tr>	435: <tr>
432: <td class="punright" style="width: 35%">Order by</td>	436: <td class="punright" style="width: 35%">Order by</td>
433: <td style="width: 35%">	437: <td style="width: 35%">
434: <select name="order_by" tabindex="18">	438: <select name="order_by" tabindex="19">
435: <option value="username" selected>username</option>	439: <option value="username" selected>username</option>
436: <option value="email">e-mail</option>	440: <option value="email">e-mail</option>
437: <option value="num_posts">posts</option>	441: <option value="num_posts">posts</option>
438: <option value="last_post">last post</option>	442: <option value="last_post">last post</option>
439: <option value="registered">registered</option>	443: <option value="registered">registered</option>
440: </select>   <select name="direction" tabindex="19">	444: </select>   <select name="direction" tabindex="20">
441: <option value="ASC" selected>ascending</option>	445: <option value="ASC" selected>ascending</option>
442: <option value="DESC">descending</option>	446: <option value="DESC">descending</option>
443: </select>	447: </select>
446: <tr>	450: <tr>
447: <td class="punright" style="width: 35%">User group</td>	451: <td class="punright" style="width: 35%">User group</td>
448: <td style="width: 35%">	452: <td style="width: 35%">
449: <select name="user_group" tabindex="20">	453: <select name="user_group" tabindex="21">
450: <option value="all" selected>All groups</option>	454: <option value="all" selected>All groups</option>
451: <option value="<?php echo PUN_USER ?>">Users</option>	455: <option value="<?php echo PUN_USER ?>">Users</option>
452: <option value="<?php echo PUN_MOD ?>">Moderators</option>	456: <option value="<?php echo PUN_MOD ?>">Moderators</option>
474: <table class="punplain" cellspacing="0" cellpadding="4">	478: <table class="punplain" cellspacing="0" cellpadding="4">
475: <tr>	479: <tr>
476: <td class="punright" style="width: 35%"><b>IP address</b><br>The IP address to search for in the post database.</td>	480: <td class="punright" style="width: 35%"><b>IP address</b><br>The IP address to search for in the post database.</td>
477: <td style="width: 35%"><input type="text" name="show_users" size="18" maxlength="15" tabindex="22"></td>	481: <td style="width: 35%"><input type="text" name="show_users" size="18" maxlength="15" tabindex="23"></td>
478: <td style="width: 30%"><input type="submit" value=" Find " tabindex="23"></td>	482: <td style="width: 30%"><input type="submit" value=" Find " tabindex="24"></td>
479: </tr>	483: </tr>
480: </table>	484: </table>
481: </td>	485: </td>

punbb-1.1/upload/edit.php	punbb-1.1.3/upload/edit.php
124:	124:
125: if ($smilies != '1') $smilies = '0';	125: if ($smilies != '1') $smilies = '0';
126:	126:
127: if (!isset($_POST['silent']) \|\| !$is_admmod)	127: $edited_sql = (!isset($_POST['silent']) \|\| !$is_admmod) ? $edited_sql = ', edited='.time().', edited_by=\''.addslashes($cur_user['username']).'\'' : '';
128: $edited_sql = ', edited='.time().', edited_by=\''.addslashes($cur_user['username']).'\'';
129:	128:
130: if ($is_topicpost && $is_admmod)	129: if ($is_topicpost && $is_admmod)
131: {	130: {

punbb-1.1/upload/footer.php	punbb-1.1.3/upload/footer.php
72: <select name="id" onchange="window.location=('viewforum.php?id='+this.options[this.selectedIndex].value)">	72: <select name="id" onchange="window.location=('viewforum.php?id='+this.options[this.selectedIndex].value)">
73: <?php	73: <?php
74:	74:
75: if ($cur_user['status'] < PUN_MOD)	75: $extra_sql = ($cur_user['status'] < PUN_MOD) ? ' WHERE f.admmod_only=\'0\'' : '';
76: $extra = ' WHERE f.admmod_only=\'0\'';
77:	76:
78: $result = $db->query('SELECT c.id AS cid, c.cat_name, f.id AS fid, f.forum_name FROM '.$db->prefix.'categories AS c INNER JOIN '.$db->prefix.'forums AS f ON c.id=f.cat_id'.$extra.' ORDER BY c.disp_position, c.id, f.disp_position') or error('Unable to fetch category/forum list', __FILE__, __LINE__, $db->error());	77: $result = $db->query('SELECT c.id AS cid, c.cat_name, f.id AS fid, f.forum_name FROM '.$db->prefix.'categories AS c INNER JOIN '.$db->prefix.'forums AS f ON c.id=f.cat_id'.$extra_sql.' ORDER BY c.disp_position, c.id, f.disp_position') or error('Unable to fetch category/forum list', __FILE__, __LINE__, $db->error());
79:	78:
80: while ($cur_forum = $db->fetch_assoc($result))	79: while ($cur_forum = $db->fetch_assoc($result))
81: {	80: {
108: else if ($footer_style == 'topic' && $is_admmod)	107: else if ($footer_style == 'topic' && $is_admmod)
109: {	108: {
110: echo "\t\t\t\t\t\t".'<br><a href="moderate.php?fid='.$forum_id.'&tid='.$id.'&p='.$p.'">'.$lang_common['Delete posts'].'</a><br>'."\n";	109: echo "\t\t\t\t\t\t".'<br><a href="moderate.php?fid='.$forum_id.'&tid='.$id.'&p='.$p.'">'.$lang_common['Delete posts'].'</a><br>'."\n";
111: echo "\t\t\t\t\t\t".'<a href="moderate.php?fid='.$forum_id.'&move='.$id.'">'.$lang_common['Move topic'].'</a><br>'."\n";	110: echo "\t\t\t\t\t\t".'<a href="moderate.php?fid='.$forum_id.'&move_topics='.$id.'">'.$lang_common['Move topic'].'</a><br>'."\n";
112:	111:
113: if ($closed == '1')	112: if ($closed == '1')
114: echo "\t\t\t\t\t\t".'<a href="moderate.php?fid='.$forum_id.'&open='.$id.'">'.$lang_common['Open topic'].'</a><br>'."\n";	113: echo "\t\t\t\t\t\t".'<a href="moderate.php?fid='.$forum_id.'&open='.$id.'">'.$lang_common['Open topic'].'</a><br>'."\n";

punbb-1.1/upload/help.php	punbb-1.1.3/upload/help.php
93: <?php echo $lang_help['Quotes info'] ?><br><br>	93: <?php echo $lang_help['Quotes info'] ?><br><br>
94:     [quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]<br><br>	94:     [quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]<br><br>
95: <?php echo $lang_help['produces quote box'] ?><br><br>	95: <?php echo $lang_help['produces quote box'] ?><br><br>
96: <table style="width: 95%" align="center" cellspacing="4" cellpadding="6"><tr><td class="punquote"><span class="puntext"><b>James <?php echo $lang_common['wrote'] ?>:</b><br><br>Text</span></td></tr></table><br>	96: <table style="width: 95%" align="center" cellspacing="4" cellpadding="6"><tr><td class="punquote"><span class="puntext"><b>James <?php echo $lang_common['wrote'] ?>:</b><br><br><?php echo $lang_help['Quote text'] ?></span></td></tr></table><br>
97: <?php echo $lang_help['Quotes info 2'] ?><br><br>	97: <?php echo $lang_help['Quotes info 2'] ?><br><br>
98:     [quote]<?php echo $lang_help['Quote text'] ?>[/quote]<br><br>	98:     [quote]<?php echo $lang_help['Quote text'] ?>[/quote]<br><br>
99: <?php echo $lang_help['produces quote box'] ?><br><br>	99: <?php echo $lang_help['produces quote box'] ?><br><br>

punbb-1.1/upload/include/common.php	punbb-1.1.3/upload/include/common.php
48: // Turn off magic_quotes_runtime	48: // Turn off magic_quotes_runtime
49: set_magic_quotes_runtime(0);	49: set_magic_quotes_runtime(0);
50:	50:
51: // Attempt to turn off register_globals (this really isn't needed, but we'll do it anyway)
52: @ini_set('register_globals', 0);
53:
54: // Seed the random number generator	51: // Seed the random number generator
55: mt_srand((double)microtime()*1000000);	52: mt_srand((double)microtime()*1000000);
56:	53:

punbb-1.1/upload/include/common_admin.php	punbb-1.1.3/upload/include/common_admin.php
82: //	82: //
83: function prune($forum_id, $prune_sticky, $prune_date)	83: function prune($forum_id, $prune_sticky, $prune_date)
84: {	84: {
85: global $db;	85: global $pun_root, $db;
86:	86:
87: if ($prune_date != -1)	87: $extra_sql = ($prune_date != -1) ? ' AND last_post<'.$prune_date : '';
88: $extra = ' AND last_post<'.$prune_date;
89:	88:
90: if (!$prune_sticky)	89: if (!$prune_sticky)
91: $extra .= ' AND sticky=\'0\'';	90: $extra_sql .= ' AND sticky=\'0\'';
92:	91:
93: // Fetch topics to prune	92: // Fetch topics to prune
94: $result = $db->query('SELECT id FROM '.$db->prefix.'topics WHERE forum_id='.$forum_id.$extra) or error('Unable to fetch topics', __FILE__, __LINE__, $db->error());	93: $result = $db->query('SELECT id FROM '.$db->prefix.'topics WHERE forum_id='.$forum_id.$extra_sql) or error('Unable to fetch topics', __FILE__, __LINE__, $db->error());
95:	94:
96: while ($row = $db->fetch_row($result))	95: while ($row = $db->fetch_row($result))
97: $topic_ids .= (($topic_ids != '') ? ',' : '').$row[0];	96: $topic_ids .= (($topic_ids != '') ? ',' : '').$row[0];
112: $db->query('DELETE FROM '.$db->prefix.'posts WHERE id IN('.$post_ids.')') or error('Unable to prune posts', __FILE__, __LINE__, $db->error());	111: $db->query('DELETE FROM '.$db->prefix.'posts WHERE id IN('.$post_ids.')') or error('Unable to prune posts', __FILE__, __LINE__, $db->error());
113:	112:
114: // We removed a bunch of posts, so now we have to update the search index	113: // We removed a bunch of posts, so now we have to update the search index
115: require $pun_root.'include/search_idx.php';	114: require_once $pun_root.'include/search_idx.php';
116: strip_search_index($post_ids);	115: strip_search_index($post_ids);
117: }	116: }
118: }	117: }

punbb-1.1/upload/include/dblayer/pgsql.php	punbb-1.1.3/upload/include/dblayer/pgsql.php
23: ************************************************************************/	23: ************************************************************************/
24:	24:
25:	25:
26: // Make sure we have built in support for MySQL	26: // Make sure we have built in support for PostgreSQL
27: if (!function_exists('pg_connect'))	27: if (!function_exists('pg_connect'))
28: exit('This PHP environment doesn\'t have PostgreSQL support built in. PostgreSQL support is required if you want to use a PostgreSQL database to run this forum. Consult the PHP documentation for further assistance.');	28: exit('This PHP environment doesn\'t have PostgreSQL support built in. PostgreSQL support is required if you want to use a PostgreSQL database to run this forum. Consult the PHP documentation for further assistance.');
29:	29:
111: if (defined('PUN_SHOW_QUERIES'))	111: if (defined('PUN_SHOW_QUERIES'))
112: $this->saved_queries[] = array('BEGIN', 0);	112: $this->saved_queries[] = array('BEGIN', 0);
113:	113:
114: if (!@pg_exec($this->link_id, 'BEGIN'))	114: if (!@pg_query($this->link_id, 'BEGIN'))
115: return false;	115: return false;
116: }	116: }
117:	117:
118: if (defined('PUN_SHOW_QUERIES'))	118: if (defined('PUN_SHOW_QUERIES'))
119: $q_start = get_microtime();	119: $q_start = get_microtime();
120:	120:
121: $this->query_result = @pg_exec($this->link_id, $sql);	121: $this->query_result = @pg_query($this->link_id, $sql);
122: if ($this->query_result)	122: if ($this->query_result)
123: {	123: {
124: if (defined('PUN_SHOW_QUERIES'))	124: if (defined('PUN_SHOW_QUERIES'))
131: if (defined('PUN_SHOW_QUERIES'))	131: if (defined('PUN_SHOW_QUERIES'))
132: $this->saved_queries[] = array('COMMIT', 0);	132: $this->saved_queries[] = array('COMMIT', 0);
133:	133:
134: if (!@pg_exec($this->link_id, 'COMMIT'))	134: if (!@pg_query($this->link_id, 'COMMIT'))
135: {	135: {
136: if (defined('PUN_SHOW_QUERIES'))	136: if (defined('PUN_SHOW_QUERIES'))
137: $this->saved_queries[] = array('ROLLBACK', 0);	137: $this->saved_queries[] = array('ROLLBACK', 0);
138:	138:
139: @pg_exec($this->link_id, 'ROLLBACK');	139: @pg_query($this->link_id, 'ROLLBACK');
140: return false;	140: return false;
141: }	141: }
142: }	142: }
154: $this->saved_queries[] = array('ROLLBACK', 0);	154: $this->saved_queries[] = array('ROLLBACK', 0);
155:	155:
156: if ($this->in_transaction)	156: if ($this->in_transaction)
157: @pg_exec($this->link_id, 'ROLLBACK');	157: @pg_query($this->link_id, 'ROLLBACK');
158:	158:
159: $this->in_transaction = false;	159: $this->in_transaction = false;
160:	160:
170: if (defined('PUN_SHOW_QUERIES'))	170: if (defined('PUN_SHOW_QUERIES'))
171: $this->saved_queries[] = array('COMMIT', 0);	171: $this->saved_queries[] = array('COMMIT', 0);
172:	172:
173: if (!@pg_exec($this->link_id, 'COMMIT'))	173: if (!@pg_query($this->link_id, 'COMMIT'))
174: {	174: {
175: if (defined('PUN_SHOW_QUERIES'))	175: if (defined('PUN_SHOW_QUERIES'))
176: $this->saved_queries[] = array('ROLLBACK', 0);	176: $this->saved_queries[] = array('ROLLBACK', 0);
177:	177:
178: @pg_exec($this->link_id, 'ROLLBACK');	178: @pg_query($this->link_id, 'ROLLBACK');
179: return false;	179: return false;
180: }	180: }
181: }	181: }
260: function num_rows($query_id = 0)	260: function num_rows($query_id = 0)
261: {	261: {
262: if (!$query_id)	262: if (!$query_id)
263: {
264: $query_id = $this->query_result;	263: $query_id = $this->query_result;
265: }
266:	264:
267: return ($query_id) ? @pg_num_rows($query_id) : false;	265: return ($query_id) ? @pg_num_rows($query_id) : false;
268: }	266: }
286: if (preg_match('/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is', $this->last_query_text[$query_id], $tablename))	284: if (preg_match('/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is', $this->last_query_text[$query_id], $tablename))
287: {	285: {
288: $sql = 'SELECT currval(\''.$tablename[1].'_id_seq\') AS lastval';	286: $sql = 'SELECT currval(\''.$tablename[1].'_id_seq\') AS lastval';
289: $temp_q_id = @pg_exec($this->link_id, $sql);	287: $temp_q_id = @pg_query($this->link_id, $sql);
290:	288:
291: if (!$temp_q_id)	289: if (!$temp_q_id)
292: return false;	290: return false;
318: if (!$query_id)	316: if (!$query_id)
319: $query_id = $this->query_result;	317: $query_id = $this->query_result;
320:	318:
321: return ($query_id) ? @pg_freeresult($query_id) : false;	319: return ($query_id) ? @pg_free_result($query_id) : false;
322: }	320: }
323:	321:
324:	322:
343: if (defined('PUN_SHOW_QUERIES'))	341: if (defined('PUN_SHOW_QUERIES'))
344: $this->saved_queries[] = array('COMMIT', 0);	342: $this->saved_queries[] = array('COMMIT', 0);
345:	343:
346: @pg_exec($this->link_id, 'COMMIT');	344: @pg_query($this->link_id, 'COMMIT');
347: }	345: }
348:	346:
349: if ($this->query_result)	347: if ($this->query_result)
350: @pg_freeresult($this->query_result);	348: @pg_free_result($this->query_result);
351:	349:
352: return @pg_close($this->link_id);	350: return @pg_close($this->link_id);
353: }	351: }

punbb-1.1/upload/include/functions.php	punbb-1.1.3/upload/include/functions.php
328: if ($user['title'] != '')	328: if ($user['title'] != '')
329: $user_title = pun_htmlspecialchars($user['title']);	329: $user_title = pun_htmlspecialchars($user['title']);
330: // If the user is banned	330: // If the user is banned
331: else if (in_array(strtolower($user['username']), $ban_list))	331: else if (in_array(strtolower($user['username']), $ban_list, true))
332: $user_title = $lang_common['Banned'];	332: $user_title = $lang_common['Banned'];
333: else if ($user['status'] <= PUN_USER)	333: else if ($user['status'] <= PUN_USER)
334: {	334: {

punbb-1.1/upload/include/parser.php	punbb-1.1.3/upload/include/parser.php
72: {	72: {
73: global $lang_common;	73: global $lang_common;
74:	74:
75: set_time_limit(3);
76:
77: // The maximum allowed quote depth	75: // The maximum allowed quote depth
78: $max_depth = 3;	76: $max_depth = 3;
79:	77:
180: $full_url = 'http://'.$full_url;	178: $full_url = 'http://'.$full_url;
181: else if (strpos($url, 'ftp.') === 0)	179: else if (strpos($url, 'ftp.') === 0)
182: $full_url = 'ftp://'.$full_url;	180: $full_url = 'ftp://'.$full_url;
	181: else if (strpos($url, 'http://') !== 0)
	182: $full_url = 'http://'.$full_url;
183:	183:
184: // Ok, not very pretty :-)	184: // Ok, not very pretty :-)
185: $link = ($link == '' \|\| $link == $url) ? ((strlen($url) > 55) ? substr($url, 0 , 39).' ... '.substr($url, -10) : $url) : stripslashes($link);	185: $link = ($link == '' \|\| $link == $url) ? ((strlen($url) > 55) ? substr($url, 0 , 39).' ... '.substr($url, -10) : $url) : stripslashes($link);
207: '#\[email=(.?)\](.?)\[/email\]#',	207: '#\[email=(.?)\](.?)\[/email\]#',
208: '#\[color=([a-zA-Z]\|\#?[0-9a-fA-F]{6})](.?)\[/color\]#s');	208: '#\[color=([a-zA-Z]\|\#?[0-9a-fA-F]{6})](.?)\[/color\]#s');
209:	209:
210: $replace = array('<b>$1</b>',	210: $replace = array('<strong>$1</strong>',
211: '<i>$1</i>',	211: '<em>$1</em>',
212: '<u>$1</u>',	212: '<u>$1</u>',
213: 'truncate_url("$1")',	213: 'truncate_url(\'$1\')',
214: 'truncate_url("$1", "$2")',	214: 'truncate_url(\'$1\', \'$2\')',
215: '<a href="mailto:$1">$1</a>',	215: '<a href="mailto:$1">$1</a>',
216: '<a href="mailto:$1">$2</a>',	216: '<a href="mailto:$1">$2</a>',
217: '<span style="color: $1">$2</span>');	217: '<span style="color: $1">$2</span>');
239:	239:
240: $message = ' '.$message;	240: $message = ' '.$message;
241:	241:
242: $message = preg_replace('#([\t\n ])(https?\|ftp\|news){1}://([\w\-]+\.([\w\-]+\.)[\w]+(:[0-9]+)?(/[^ "\n\r\t<])?)#ie', '"$1".truncate_url("$2://$3")', $message);	242: $message = preg_replace('#([\s])(https?\|ftp\|news){1}://([\w\-]+\.([\w\-]+\.)[\w]+(:[0-9]+)?(/[^"\s<\[])?)#ie', '\'$1\'.truncate_url(\'$2://$3\')', $message);
243: $message = preg_replace('#([\t\n ])(www\|ftp)\.(([\w\-]+\.)[\w]+(:[0-9]+)?(/[^ "\n\r\t<])?)#ie', '"$1".truncate_url("$2.$3", "$2.$3")', $message);	243: $message = preg_replace('#([\s])(www\|ftp)\.(([\w\-]+\.)[\w]+(:[0-9]+)?(/[^"\s<\[])?)#ie', '\'$1\'.truncate_url(\'$2.$3\', \'$2.$3\')', $message);
244:	244:
245: return substr($message, 1);	245: return substr($message, 1);
246: }	246: }

punbb-1.1/upload/include/search_idx.php	punbb-1.1.3/upload/include/search_idx.php
43:	43:
44: if (empty($noise_match))	44: if (empty($noise_match))
45: {	45: {
46: $noise_match = array('^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '\|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', ';', '!', '*');	46: $noise_match = array('quote', 'code', 'url', 'img', 'email', 'color', 'colour', '^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '\|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', ';', '!', '*');
47: $noise_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '' , ' ', ' ', ' ', ' ', ' ', ' ');	47: $noise_replace = array('', '', '', '', '', '', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '' , ' ', ' ', ' ', ' ', ' ', ' ');
48:	48:
49: $stopwords = @file('lang/'.$language.'/'.$language.'_stopwords.txt');	49: $stopwords = @file('lang/'.$language.'/'.$language.'_stopwords.txt');
50: }	50: }

punbb-1.1/upload/index.php	punbb-1.1.3/upload/index.php
53:	53:
54:	54:
55: // Print the categories and forums	55: // Print the categories and forums
56: if ($cur_user['status'] < PUN_MOD)	56: $extra_sql = ($cur_user['status'] < PUN_MOD) ? ' WHERE f.admmod_only=\'0\'' : '';
57: $extra = ' WHERE f.admmod_only=\'0\'';
58:	57:
59: $result = $db->query('SELECT c.id AS cid, c.cat_name, f.id AS fid, f.forum_name, f.forum_desc, f.moderators, f.num_topics, f.num_posts, f.last_post, f.last_post_id, f.last_poster, f.closed FROM '.$db->prefix.'categories AS c INNER JOIN '.$db->prefix.'forums AS f ON c.id=f.cat_id'.$extra.' ORDER BY c.disp_position, c.id, f.disp_position') or error('Unable to fetch category/forum list', __FILE__, __LINE__, $db->error());	58: $result = $db->query('SELECT c.id AS cid, c.cat_name, f.id AS fid, f.forum_name, f.forum_desc, f.moderators, f.num_topics, f.num_posts, f.last_post, f.last_post_id, f.last_poster, f.closed FROM '.$db->prefix.'categories AS c INNER JOIN '.$db->prefix.'forums AS f ON c.id=f.cat_id'.$extra_sql.' ORDER BY c.disp_position, c.id, f.disp_position') or error('Unable to fetch category/forum list', __FILE__, __LINE__, $db->error());
60:	59:
61: while ($cur_forum = $db->fetch_assoc($result))	60: while ($cur_forum = $db->fetch_assoc($result))
62: {	61: {

punbb-1.1/upload/install.php	punbb-1.1.3/upload/install.php
24:	&nb