PunBB 1.3.3 to 1.3.4 changes | Legend | |
---|---|---|
Lines removed | ||
Lines changed | ||
Lines added |
punbb-1.3.3/admin/db_update.php | punbb-1.3.4/admin/db_update.php |
---|---|
10: */ | 10: */ |
11: | 11: |
12: | 12: |
13: define('UPDATE_TO', '1.3.3'); | 13: define('UPDATE_TO', '1.3.4'); |
14: define('UPDATE_TO_DB_REVISION', 4); | 14: define('UPDATE_TO_DB_REVISION', 4); |
15: | 15: |
16: // The number of items to process per pageview (lower this if the update script times out during UTF-8 conversion) | 16: // The number of items to process per pageview (lower this if the update script times out during UTF-8 conversion) |
412: <div id="brd-main" class="main basic"> | 412: <div id="brd-main" class="main basic"> |
413: | 413: |
414: <div class="main-head"> | 414: <div class="main-head"> |
415: <h1 class="hn"><span>PunBB Database Update : Perform update of database tables</span></h1> | 415: <h1 class="hn"><span>PunBB Database Update: Perform update of database tables</span></h1> |
416: </div> | 416: </div> |
417: | 417: |
418: <div class="main-content frm"> | 418: <div class="main-content frm"> |
punbb-1.3.3/admin/install.php | punbb-1.3.4/admin/install.php |
---|---|
10: */ | 10: */ |
11: | 11: |
12: | 12: |
13: define('FORUM_VERSION', '1.3.3'); | 13: define('FORUM_VERSION', '1.3.4'); |
14: define('FORUM_DB_REVISION', 4); | 14: define('FORUM_DB_REVISION', 4); |
15: define('MIN_PHP_VERSION', '4.3.0'); | 15: define('MIN_PHP_VERSION', '4.3.0'); |
16: define('MIN_MYSQL_VERSION', '4.1.2'); | 16: define('MIN_MYSQL_VERSION', '4.1.2'); |
84: exit; | 84: exit; |
85: } | 85: } |
86: | 86: |
87: header('Content-Type: text/xml; charset=utf-8'); | 87: header('Content-Type: text/html; charset=utf-8'); |
88: | 88: |
89: if (!isset($_POST['form_sent'])) | 89: if (!isset($_POST['form_sent'])) |
90: { | 90: { |
punbb-1.3.3/footer.php | punbb-1.3.4/footer.php |
---|---|
35: } | 35: } |
36: } | 36: } |
37: | 37: |
38: $forum_page['copyright'] = sprintf($lang_common['Powered by'], '<a href="http://punbb.informer.com/">PunBB</a>'.($forum_config['o_show_version'] == '1' ? ' '.$forum_config['o_cur_version'] : ''), '<a href="http://www.informer.com/">Informer Technologies, Inc</a>'); | |
39: | |
40: ($hook = get_hook('ft_about_pre_copyright')) ? eval($hook) : null; | 38: ($hook = get_hook('ft_about_pre_copyright')) ? eval($hook) : null; |
41: | 39: |
42: ?> | 40: ?> |
43: <p id="copyright"><?php echo $forum_page['copyright']; ?></p> | 41: <p id="copyright"><?php echo sprintf($lang_common['Powered by'], '<a href="http://punbb.informer.com/">PunBB</a>'.($forum_config['o_show_version'] == '1' ? ' '.$forum_config['o_cur_version'] : ''), '<a href="http://www.informer.com/">Informer Technologies, Inc</a>') ?></p> |
44: <?php | 42: <?php |
45: | 43: |
46: ($hook = get_hook('ft_about_end')) ? eval($hook) : null; | 44: ($hook = get_hook('ft_about_end')) ? eval($hook) : null; |
punbb-1.3.3/include/essentials.php | punbb-1.3.4/include/essentials.php |
---|---|
9: | 9: |
10: | 10: |
11: // Enable DEBUG mode by removing // from the following line | 11: // Enable DEBUG mode by removing // from the following line |
12: define('FORUM_DEBUG', 1); | 12: //define('FORUM_DEBUG', 1); |
13: | 13: |
14: if (!defined('FORUM_ROOT')) | 14: if (!defined('FORUM_ROOT')) |
15: exit('The constant FORUM_ROOT must be defined and point to a valid PunBB installation root directory.'); | 15: exit('The constant FORUM_ROOT must be defined and point to a valid PunBB installation root directory.'); |
16: | 16: |
17: // Define the version and database revision that this code was written for | 17: // Define the version and database revision that this code was written for |
18: define('FORUM_VERSION', '1.3.3'); | 18: define('FORUM_VERSION', '1.3.4'); |
19: define('FORUM_DB_REVISION', 4); | 19: define('FORUM_DB_REVISION', 4); |
20: | 20: |
21: // Load the functions script | 21: // Load the functions script |
63: $forum_start = ((float)$usec + (float)$sec); | 63: $forum_start = ((float)$usec + (float)$sec); |
64: | 64: |
65: // Make sure PHP reports all errors except E_NOTICE. PunBB supports E_ALL, but a lot of scripts it may interact with, do not. | 65: // Make sure PHP reports all errors except E_NOTICE. PunBB supports E_ALL, but a lot of scripts it may interact with, do not. |
66: error_reporting(E_ALL); | 66: if (defined('FORUM_DEBUG')) |
67: error_reporting(E_ALL); | |
68: else | |
69: error_reporting(E_ALL ^ E_NOTICE); | |
67: | 70: |
68: // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings) | 71: // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings) |
69: setlocale(LC_CTYPE, 'C'); | 72: setlocale(LC_CTYPE, 'C'); |
punbb-1.3.3/lang/English/common.php | punbb-1.3.4/lang/English/common.php |
---|---|
161: 'Query' => 'Query', | 161: 'Query' => 'Query', |
162: 'Total query time' => 'Total query time', | 162: 'Total query time' => 'Total query time', |
163: | 163: |
164: // For official extensions | |
165: 'Official extensions inst' => '<span id="extensions-used" title="%1$s">Official extensions: %2$s installed.</span>', | |
166: | |
167: ); | 164: ); |
punbb-1.3.3/post.php | punbb-1.3.4/post.php |
---|---|
265: | 265: |
266: list($q_poster, $q_message) = $forum_db->fetch_row($result); | 266: list($q_poster, $q_message) = $forum_db->fetch_row($result); |
267: | 267: |
268: ($hook = get_hook('po_modify_quote_info')) ? eval($hook) : null; | |
269: | |
268: if ($forum_config['p_message_bbcode'] == '1') | 270: if ($forum_config['p_message_bbcode'] == '1') |
269: { | 271: { |
270: // If username contains a square bracket, we add "" or '' around it (so we know when it starts and ends) | 272: // If username contains a square bracket, we add "" or '' around it (so we know when it starts and ends) |
546: if (!defined('FORUM_PARSER_LOADED')) | 548: if (!defined('FORUM_PARSER_LOADED')) |
547: require FORUM_ROOT.'include/parser.php'; | 549: require FORUM_ROOT.'include/parser.php'; |
548: | 550: |
551: // Get the amount of posts in the topic | |
552: $query = array( | |
553: 'SELECT' => 'count(p.id)', | |
554: 'FROM' => 'posts AS p', | |
555: 'WHERE' => 'topic_id='.$tid | |
556: ); | |
557: | |
558: ($hook = get_hook('po_topic_review_qr_get_post_count')) ? eval($hook) : null; | |
559: $result = $forum_db->query_build($query) or error(__FILE__, __LINE__); | |
560: $forum_page['total_post_count'] = $forum_db->result($result, 0); | |
561: | |
549: // Get posts to display in topic review | 562: // Get posts to display in topic review |
550: $query = array( | 563: $query = array( |
551: 'SELECT' => 'p.id, p.poster, p.message, p.hide_smilies, p.posted', | 564: 'SELECT' => 'p.id, p.poster, p.message, p.hide_smilies, p.posted', |
552: 'FROM' => 'posts AS p', | 565: 'FROM' => 'posts AS p', |
553: 'WHERE' => 'topic_id='.$tid, | 566: 'WHERE' => 'topic_id='.$tid, |
554: 'ORDER BY' => 'id DESC', | 567: 'ORDER BY' => 'id DESC', |
555: 'LIMIT' => $forum_config['o_topic_review'] | 568: 'LIMIT' => $forum_config['o_topic_review'] |
556: ); | 569: ); |
557: | 570: |
558: ($hook = get_hook('po_topic_review_qr_get_topic_review_posts')) ? eval($hook) : null; | 571: ($hook = get_hook('po_topic_review_qr_get_topic_review_posts')) ? eval($hook) : null; |
572: { | 585: { |
573: ++$forum_page['item_count']; | 586: ++$forum_page['item_count']; |
574: | 587: |
575: // Generate the post heading | |
576: $forum_page['post_ident'] = array( | |
577: 'num' => '<span class="post-num">'.forum_number_format($forum_page['item_count']).'</span>', | |
578: 'link' => '<span class="post-link">'.sprintf($lang_post['Post posted'], '<a class="permalink" rel="bookmark" title="'.$lang_post['Permalink post'].'" href="'.forum_link($forum_url['post'], $cur_post['id']).'">'.format_time($cur_post['posted']).'</a>').'</span>' | |
579: ); | |
580: | |
581: ($hook = get_hook('po_topic_review_pre_item_indent_merge')) ? eval($hook) : null; | |
582: | |
583: $forum_page['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']); | 588: $forum_page['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']); |
584: | 589: |
585: // Generate the post heading | 590: // Generate the post heading |
586: $forum_page['post_ident'] = array(); | 591: $forum_page['post_ident'] = array(); |
587: $forum_page['post_ident']['num'] = '<span class="post-num">'.forum_number_format($forum_page['item_count']).'</span>'; | 592: $forum_page['post_ident']['num'] = '<span class="post-num">'.forum_number_format($forum_page['total_post_count'] - $forum_page['item_count'] + 1).'</span>'; |
588: $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf($lang_post['Post byline'], '<strong>'.forum_htmlencode($cur_post['poster']).'</strong>').'</span>'; | 593: $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf($lang_post['Post byline'], '<strong>'.forum_htmlencode($cur_post['poster']).'</strong>').'</span>'; |
589: $forum_page['post_ident']['link'] = '<span class="post-link"><a class="permalink" rel="bookmark" title="'.$lang_post['Permalink post'].'" href="'.forum_link($forum_url['post'], $cur_post['id']).'">'.format_time($cur_post['posted']).'</a></span>'; | 594: $forum_page['post_ident']['link'] = '<span class="post-link"><a class="permalink" rel="bookmark" title="'.$lang_post['Permalink post'].'" href="'.forum_link($forum_url['post'], $cur_post['id']).'">'.format_time($cur_post['posted']).'</a></span>'; |
590: | 595: |
punbb-1.3.3/profile.php | punbb-1.3.4/profile.php |
---|---|
176: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 176: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
177: <div class="sf-box text required"> | 177: <div class="sf-box text required"> |
178: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['New password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Password help'] ?></small></label><br /> | 178: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['New password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Password help'] ?></small></label><br /> |
179: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password1" size="35" value="<?php echo(isset($_POST['req_new_password1']) ? ($_POST['req_new_password1']) : ''); ?>"/></span><br /> | 179: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password1" size="35" value="<?php echo(isset($_POST['req_new_password1']) ? forum_htmlencode($_POST['req_new_password1']) : ''); ?>"/></span><br /> |
180: </div> | 180: </div> |
181: </div> | 181: </div> |
182: <?php ($hook = get_hook('pf_change_pass_key_pre_new_password_confirm')) ? eval($hook) : null; ?> | 182: <?php ($hook = get_hook('pf_change_pass_key_pre_new_password_confirm')) ? eval($hook) : null; ?> |
183: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 183: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
184: <div class="sf-box text required"> | 184: <div class="sf-box text required"> |
185: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm new password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> | 185: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm new password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> |
186: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password2" size="35" value="<?php echo(isset($_POST['req_new_password2']) ? ($_POST['req_new_password2']) : ''); ?>"/></span><br /> | 186: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password2" size="35" value="<?php echo(isset($_POST['req_new_password2']) ? forum_htmlencode($_POST['req_new_password2']) : ''); ?>"/></span><br /> |
187: </div> | 187: </div> |
188: </div> | 188: </div> |
189: <?php ($hook = get_hook('pf_change_pass_key_pre_fieldset_end')) ? eval($hook) : null; ?> | 189: <?php ($hook = get_hook('pf_change_pass_key_pre_fieldset_end')) ? eval($hook) : null; ?> |
337: <legend class="group-legend"><strong><?php echo $lang_common['Required information'] ?></strong></legend> | 337: <legend class="group-legend"><strong><?php echo $lang_common['Required information'] ?></strong></legend> |
338: <?php ($hook = get_hook('pf_change_pass_normal_pre_old_password')) ? eval($hook) : null; ?> | 338: <?php ($hook = get_hook('pf_change_pass_normal_pre_old_password')) ? eval($hook) : null; ?> |
339: <?php if (!$forum_user['is_admmod']): ?> | 339: <?php if (!$forum_user['is_admmod']): ?> |
340: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 340: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
341: <div class="sf-box text required"> | 341: <div class="sf-box text required"> |
342: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Old password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Old password help'] ?></small></label><br /> | 342: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Old password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Old password help'] ?></small></label><br /> |
343: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_old_password" size="35" value="<?php echo(isset($_POST['req_old_password']) ? ($_POST['req_old_password']) : ''); ?>"/></span> | 343: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_old_password" size="35" value="<?php echo(isset($_POST['req_old_password']) ? forum_htmlencode($_POST['req_old_password']) : ''); ?>"/></span> |
344: </div> | 344: </div> |
345: </div> | 345: </div> |
346: <?php endif; ($hook = get_hook('pf_change_pass_normal_pre_new_password')) ? eval($hook) : null; ?> | 346: <?php endif; ($hook = get_hook('pf_change_pass_normal_pre_new_password')) ? eval($hook) : null; ?> |
347: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 347: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
348: <div class="sf-box text required"> | 348: <div class="sf-box text required"> |
349: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['New password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Password help'] ?></small></label><br /> | 349: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['New password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Password help'] ?></small></label><br /> |
350: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password1" size="35" value="<?php echo(isset($_POST['req_new_password1']) ? ($_POST['req_new_password1']) : ''); ?>"/></span><br /> | 350: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password1" size="35" value="<?php echo(isset($_POST['req_new_password1']) ? forum_htmlencode($_POST['req_new_password1']) : ''); ?>"/></span><br /> |
351: </div> | 351: </div> |
352: </div> | 352: </div> |
353: <?php ($hook = get_hook('pf_change_pass_normal_pre_new_password_confirm')) ? eval($hook) : null; ?> | 353: <?php ($hook = get_hook('pf_change_pass_normal_pre_new_password_confirm')) ? eval($hook) : null; ?> |
354: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 354: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
355: <div class="sf-box text required"> | 355: <div class="sf-box text required"> |
356: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm new password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> | 356: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Confirm new password'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <small><?php echo $lang_profile['Confirm password help'] ?></small></label><br /> |
357: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password2" size="35" value="<?php echo(isset($_POST['req_new_password2']) ? ($_POST['req_new_password2']) : ''); ?>"/></span><br /> | 357: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_new_password2" size="35" value="<?php echo(isset($_POST['req_new_password2']) ? forum_htmlencode($_POST['req_new_password2']) : ''); ?>"/></span><br /> |
358: </div> | 358: </div> |
359: </div> | 359: </div> |
360: <?php ($hook = get_hook('pf_change_pass_normal_pre_fieldset_end')) ? eval($hook) : null; ?> | 360: <?php ($hook = get_hook('pf_change_pass_normal_pre_fieldset_end')) ? eval($hook) : null; ?> |
610: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> | 610: <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>"> |
611: <div class="sf-box text required"> | 611: <div class="sf-box text required"> |
612: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Password'] ?> <em><?php echo $lang_common['Required'] ?></em></span></label><br /> | 612: <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_profile['Password'] ?> <em><?php echo $lang_common['Required'] ?></em></span></label><br /> |
613: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_password" size="25" value="<?php echo(isset($_POST['req_password']) ? ($_POST['req_password']) : ''); ?>"/></span> | 613: <span class="fld-input"><input type="password" id="fld<?php echo $forum_page['fld_count'] ?>" name="req_password" size="25" value="<?php echo(isset($_POST['req_password']) ? forum_htmlencode($_POST['req_password']) : ''); ?>"/></span> |
614: </div> | 614: </div> |
615: </div> | 615: </div> |
616: <?php ($hook = get_hook('pf_change_email_normal_pre_fieldset_end')) ? eval($hook) : null; ?> | 616: <?php ($hook = get_hook('pf_change_email_normal_pre_fieldset_end')) ? eval($hook) : null; ?> |
punbb-1.3.3/style/Oxygen/Oxygen_ie7.css | punbb-1.3.4/style/Oxygen/Oxygen_ie7.css |
---|---|
59: | 59: |
60: #brd-admin-settings-setup #fld19, #brd-post textarea#fld1, #brd-post textarea#fld2, #brd-viewtopic textarea#fld1, #brd-postedit #fld2 { | 60: #brd-admin-settings-setup #fld19, #brd-post textarea#fld1, #brd-post textarea#fld2, #brd-viewtopic textarea#fld1, #brd-postedit #fld2 { |
61: margin-top: -19px; | 61: margin-top: -19px; |
62: } | |
63: | 62: |
63: } | |
64: | |
65: .item-starter{ | |
66: position: relative; | |
67: left: -0.5em; | |
68: } | |
64: | 69: |