+
diff -urN punbb-1.4.2/include/template/help.tpl punbb-1.4.3/include/template/help.tpl
--- punbb-1.4.2/include/template/help.tpl 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/template/help.tpl 2015-06-15 09:21:05.000000000 -0400
@@ -6,6 +6,7 @@
+
diff -urN punbb-1.4.2/include/template/maintenance.tpl punbb-1.4.3/include/template/maintenance.tpl
--- punbb-1.4.2/include/template/maintenance.tpl 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/template/maintenance.tpl 2015-06-15 09:21:05.000000000 -0400
@@ -5,6 +5,7 @@
>
+
diff -urN punbb-1.4.2/include/template/main.tpl punbb-1.4.3/include/template/main.tpl
--- punbb-1.4.2/include/template/main.tpl 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/template/main.tpl 2015-06-15 09:21:05.000000000 -0400
@@ -5,6 +5,7 @@
>
+
@@ -45,5 +46,20 @@
+
diff -urN punbb-1.4.2/include/template/redirect.tpl punbb-1.4.3/include/template/redirect.tpl
--- punbb-1.4.2/include/template/redirect.tpl 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/template/redirect.tpl 2015-06-15 09:21:05.000000000 -0400
@@ -5,6 +5,7 @@
>
+
diff -urN punbb-1.4.2/include/url/Default/forum_urls.php punbb-1.4.3/include/url/Default/forum_urls.php
--- punbb-1.4.2/include/url/Default/forum_urls.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/url/Default/forum_urls.php 2015-06-15 09:21:05.000000000 -0400
@@ -38,6 +38,7 @@
'mark_forum_read' => 'misc.php?action=markforumread&fid=$1&csrf_token=$2',
'new_topic' => 'post.php?fid=$1',
'new_reply' => 'post.php?tid=$1',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'viewtopic.php?pid=$1#p$1',
'profile_about' => 'profile.php?section=about&id=$1',
'profile_identity' => 'profile.php?section=identity&id=$1',
diff -urN punbb-1.4.2/include/url/File_based/forum_urls.php punbb-1.4.3/include/url/File_based/forum_urls.php
--- punbb-1.4.2/include/url/File_based/forum_urls.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/url/File_based/forum_urls.php 2015-06-15 09:21:05.000000000 -0400
@@ -40,6 +40,7 @@
'mark_forum_read' => 'mark-forum$1-read-$2.html',
'new_topic' => 'new-topic$1.html',
'new_reply' => 'new-reply$1.html',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post$1.html#p$1',
'profile_about' => 'user$1-about.html',
'profile_identity' => 'user$1-identity.html',
diff -urN punbb-1.4.2/include/url/File_based_(fancy)/forum_urls.php punbb-1.4.3/include/url/File_based_(fancy)/forum_urls.php
--- punbb-1.4.2/include/url/File_based_(fancy)/forum_urls.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/url/File_based_(fancy)/forum_urls.php 2015-06-15 09:21:05.000000000 -0400
@@ -41,6 +41,7 @@
'mark_forum_read' => 'mark-forum$1-read-$2.html',
'new_topic' => 'new-topic$1.html',
'new_reply' => 'new-reply$1.html',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post$1.html#p$1',
'profile_about' => 'user$1-about.html',
'profile_identity' => 'user$1-identity.html',
diff -urN punbb-1.4.2/include/url/Folder_based/forum_urls.php punbb-1.4.3/include/url/Folder_based/forum_urls.php
--- punbb-1.4.2/include/url/Folder_based/forum_urls.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/url/Folder_based/forum_urls.php 2015-06-15 09:21:05.000000000 -0400
@@ -38,6 +38,7 @@
'mark_forum_read' => 'mark/forum/$1/read/$2/',
'new_topic' => 'new/topic/$1/',
'new_reply' => 'new/reply/$1/',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post/$1/#p$1',
'profile_about' => 'user/$1/about/',
'profile_identity' => 'user/$1/identity/',
diff -urN punbb-1.4.2/include/url/Folder_based_(fancy)/forum_urls.php punbb-1.4.3/include/url/Folder_based_(fancy)/forum_urls.php
--- punbb-1.4.2/include/url/Folder_based_(fancy)/forum_urls.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/include/url/Folder_based_(fancy)/forum_urls.php 2015-06-15 09:21:05.000000000 -0400
@@ -39,6 +39,7 @@
'mark_forum_read' => 'mark/forum/$1/read/$2/',
'new_topic' => 'new/topic/$1/',
'new_reply' => 'new/reply/$1/',
+ 'opensearch' => 'misc.php?action=opensearch',
'post' => 'post/$1/#p$1',
'profile_about' => 'user/$1/about/',
'profile_identity' => 'user/$1/identity/',
diff -urN punbb-1.4.2/lang/English/admin_ext.php punbb-1.4.3/lang/English/admin_ext.php
--- punbb-1.4.2/lang/English/admin_ext.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/admin_ext.php 2015-06-15 09:21:05.000000000 -0400
@@ -70,5 +70,7 @@
'Disable dependency' => 'This extension cannot be disabled while "%s" is enabled.',
'Disabled dependency' => 'This extension cannot be enabled while "%s" is disabled.',
'Download latest version' => 'Download latest version',
+'Version dependency error' => 'Extension "%s" must be version %s or higher',
+'Install ext errors' => 'Warning! The following errors must be corrected before extension can be installed:',
);
diff -urN punbb-1.4.2/lang/English/common.php punbb-1.4.3/lang/English/common.php
--- punbb-1.4.2/lang/English/common.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/common.php 2015-06-15 09:21:05.000000000 -0400
@@ -169,4 +169,8 @@
'Forum error db reported' => 'Database reported:',
'Forum error db query' => 'Failed query:',
+// Menu
+'Menu admin' => 'Admin Menu',
+'Menu profile' => 'Profile Menu',
+
);
diff -urN punbb-1.4.2/lang/English/login.php punbb-1.4.3/lang/English/login.php
--- punbb-1.4.2/lang/English/login.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/login.php 2015-06-15 09:21:05.000000000 -0400
@@ -21,6 +21,7 @@
'Obtain pass' => 'new password',
'register' => 'register',
'Submit password request' => 'Submit request',
+'Email important' => 'Contact the forum administrator at %s to change password on specified email address.',
'Email flood' => 'This account has already requested a new password in the past %s seconds. Please wait a while before requesting a new password again.',
'New password request' => 'New password request',
'New password errors' => 'Warning! The following errors must be corrected before a new password can be sent:',
diff -urN punbb-1.4.2/lang/English/misc.php punbb-1.4.3/lang/English/misc.php
--- punbb-1.4.2/lang/English/misc.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/misc.php 2015-06-15 09:21:05.000000000 -0400
@@ -11,6 +11,7 @@
'Form e-mail errors' => 'Warning! The following errors must be corrected before your message can be sent:',
'No e-mail subject' => 'You must enter a subject.',
'No e-mail message' => 'You must enter a message.',
+'Too long e-mail subject' => 'Subjects cannot be longer than %s characters.',
'Too long e-mail message' => 'Your message length is %s bytes. This exceeds the %s bytes limit.',
'Email flood' => 'At least %s seconds have to pass between sent emails. Please wait a while and try sending again.',
'E-mail sent redirect' => 'Email sent.',
diff -urN punbb-1.4.2/lang/English/post.php punbb-1.4.3/lang/English/post.php
--- punbb-1.4.2/lang/English/post.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/post.php 2015-06-15 09:21:05.000000000 -0400
@@ -5,7 +5,7 @@
// Post validation stuff (many are similar to those in edit.php)
'No subject' => 'Topics must contain a subject.',
-'Too long subject' => 'Subjects cannot be longer than 70 characters.',
+'Too long subject' => 'Subjects cannot be longer than %s characters.',
'All caps subject' => 'Subjects cannot contain only capital letters.',
'No message' => 'You must enter a message.',
'Too long message' => 'Your post length is %s bytes. This exceeds the %s bytes limit.',
diff -urN punbb-1.4.2/lang/English/profile.php punbb-1.4.3/lang/English/profile.php
--- punbb-1.4.2/lang/English/profile.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/lang/English/profile.php 2015-06-15 09:21:05.000000000 -0400
@@ -92,6 +92,9 @@
'AOL IM' => 'AOL IM',
'Forbidden title' => 'The title you entered contains a forbidden word. You must choose a different title.',
'Bad ICQ' => 'You entered an invalid ICQ UIN.',
+'Bad Twitter' => 'You entered an invalid Twitter account.',
+'Bad Facebook' => 'You entered an invalid Facebook account.',
+'Bad LinkedIn' => 'You entered an invalid LinkedIn account.',
'Yahoo' => 'Yahoo! Messenger',
'Posts and topics' => 'Posts and topics',
'Private info' => 'Private information',
diff -urN punbb-1.4.2/login.php punbb-1.4.3/login.php
--- punbb-1.4.2/login.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/login.php 2015-06-15 09:21:05.000000000 -0400
@@ -205,7 +205,7 @@
// Fetch user matching $email
$query = array(
- 'SELECT' => 'u.id, u.username, u.salt, u.last_email_sent',
+ 'SELECT' => 'u.id, u.group_id, u.username, u.salt, u.last_email_sent',
'FROM' => 'users AS u',
'WHERE' => 'u.email=\''.$forum_db->escape($email).'\''
);
@@ -243,6 +243,9 @@
($hook = get_hook('li_forgot_pass_pre_flood_check')) ? eval($hook) : null;
+ if ($cur_hit['group_id'] == FORUM_ADMIN)
+ message(sprintf($lang_login['Email important'], ''.forum_htmlencode($forum_config['o_admin_email']).''));
+
if ($cur_hit['last_email_sent'] != '' && (time() - $cur_hit['last_email_sent']) < $forgot_pass_timeout && (time() - $cur_hit['last_email_sent']) >= 0)
message(sprintf($lang_login['Email flood'], $forgot_pass_timeout));
diff -urN punbb-1.4.2/misc.php punbb-1.4.3/misc.php
--- punbb-1.4.2/misc.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/misc.php 2015-06-15 09:21:05.000000000 -0400
@@ -152,6 +152,37 @@
redirect(forum_link($forum_url['forum'], array($fid, sef_friendly($forum_name))), $lang_misc['Mark forum read redirect']);
}
+// OpenSearch plugin?
+else if ($action == 'opensearch')
+{
+ // Send XML/no cache headers
+ header('Content-Type: text/xml; charset=utf-8');
+ header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Pragma: public');
+
+ echo ''."\n";
+ echo ''."\n";
+ echo "\t".''.forum_htmlencode($forum_config['o_board_title']).''."\n";
+ echo "\t".''.forum_htmlencode($forum_config['o_board_desc']).''."\n";
+ echo "\t".'utf-8'."\n";
+ echo "\t".'utf-8'."\n";
+ echo "\t".''.$base_url.'/favicon.ico'."\n";
+ echo "\t".''."\n";
+ echo "\t".''."\n";
+ echo "\t".''.forum_htmlencode($forum_config['o_admin_email']).''."\n";
+
+ if ($forum_config['o_show_version'] == '1')
+ echo "\t".'PunBB '.$forum_config['o_cur_version'].''."\n";
+ else
+ echo "\t".'PunBB'."\n";
+
+ echo "\t".''.forum_link($forum_url['search']).''."\n";
+ echo ''."\n";
+
+ exit;
+}
+
// Send form e-mail?
else if (isset($_GET['email']))
@@ -202,10 +233,15 @@
if ($subject == '')
$errors[] = $lang_misc['No e-mail subject'];
+ else if (utf8_strlen($subject) > FORUM_SUBJECT_MAXIMUM_LENGTH)
+ $errors[] = sprintf($lang_misc['Too long e-mail subject'], FORUM_SUBJECT_MAXIMUM_LENGTH);
+
if ($message == '')
$errors[] = $lang_misc['No e-mail message'];
else if (strlen($message) > FORUM_MAX_POSTSIZE_BYTES)
- $errors[] = sprintf($lang_misc['Too long e-mail message'], forum_number_format(strlen($message)), forum_number_format(FORUM_MAX_POSTSIZE_BYTES));
+ $errors[] = sprintf($lang_misc['Too long e-mail message'],
+ forum_number_format(strlen($message)), forum_number_format(FORUM_MAX_POSTSIZE_BYTES));
+
if ($forum_user['last_email_sent'] != '' && (time() - $forum_user['last_email_sent']) < $forum_user['g_email_flood'] && (time() - $forum_user['last_email_sent']) >= 0)
$errors[] = sprintf($lang_misc['Email flood'], $forum_user['g_email_flood']);
@@ -327,7 +363,7 @@
-
+
diff -urN punbb-1.4.2/moderate.php punbb-1.4.3/moderate.php
--- punbb-1.4.2/moderate.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/moderate.php 2015-06-15 09:21:05.000000000 -0400
@@ -291,8 +291,8 @@
if ($new_subject == '')
message($lang_post['No subject']);
- else if (utf8_strlen($new_subject) > 70)
- message($lang_post['Too long subject']);
+ else if (utf8_strlen($new_subject) > FORUM_SUBJECT_MAXIMUM_LENGTH)
+ message(sprintf($lang_post['Too long subject'], FORUM_SUBJECT_MAXIMUM_LENGTH));
// Get data from the new first post
$query = array(
@@ -381,7 +381,7 @@
-
+
@@ -887,6 +887,8 @@
$forum_page['cur_category'] = 0;
foreach ($forum_list as $cur_forum)
{
+ ($hook = get_hook('mr_move_topics_forum_loop_start')) ? eval($hook) : null;
+
if ($cur_forum['cid'] != $forum_page['cur_category']) // A new category since last iteration?
{
if ($forum_page['cur_category'])
@@ -898,6 +900,8 @@
if ($cur_forum['fid'] != $fid)
echo "\t\t\t\t".''."\n";
+
+ ($hook = get_hook('mr_move_topics_forum_loop_end')) ? eval($hook) : null;
}
?>
diff -urN punbb-1.4.2/post.php punbb-1.4.3/post.php
--- punbb-1.4.2/post.php 2012-02-09 15:42:20.000000000 -0500
+++ punbb-1.4.3/post.php 2015-06-15 09:21:05.000000000 -0400
@@ -121,8 +121,8 @@
if ($subject == '')
$errors[] = $lang_post['No subject'];
- else if (utf8_strlen($subject) > 70)
- $errors[] = $lang_post['Too long subject'];
+ else if (utf8_strlen($subject) > FORUM_SUBJECT_MAXIMUM_LENGTH)
+ $errors[] = sprintf($lang_post['Too long subject'], FORUM_SUBJECT_MAXIMUM_LENGTH);
else if ($forum_config['p_subject_all_caps'] == '0' && check_is_all_caps($subject) && !$forum_page['is_admmod'])
$errors[] = $lang_post['All caps subject'];
}
@@ -469,7 +469,7 @@