Changeset 637712

Timestamp:

12/12/2012 01:17:16 PM (13 years ago)

Author:

codebycarter

Message:

tagging version 1.1.0

Location:

wp-bulletin-board

Files:

• tags/1.1.0 (copied) (copied from wp-bulletin-board/trunk)
• tags/1.1.0/css/wpbb-light-style.css (modified) (3 diffs)
• tags/1.1.0/php/facebook/wpbb-facebook.php (modified) (4 diffs)
• tags/1.1.0/php/twitter/wpbb-twitter.php (modified) (1 diff)
• tags/1.1.0/php/wpbb-forum.php (modified) (51 diffs)
• tags/1.1.0/readme.txt (modified) (4 diffs)
• tags/1.1.0/wp-bb.php (modified) (22 diffs)
• trunk/css/wpbb-light-style.css (modified) (3 diffs)
• trunk/php/facebook/wpbb-facebook.php (modified) (4 diffs)
• trunk/php/twitter/wpbb-twitter.php (modified) (1 diff)
• trunk/php/wpbb-forum.php (modified) (51 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/wp-bb.php (modified) (22 diffs)

wp-bulletin-board/tags/1.1.0/css/wpbb-light-style.css

@@ -1 +1 @@
 /* 
     WPBB light style
-    
-    To be used on a light background, preferably white
-    
-    This only affects the front end as the back end implements wordpress styling.
 */
 
@@ -30 +26 @@
     font-weight:bold;
     padding-bottom:10px;
+}
+
+/* Change the forum title position and color of the slash (/) character here */
+h2.wpbb-forum-title {
+    text-align:center;
+    padding-bottom:10px;
+}
+
+/* Change the color of the forum title link here, boldness, etc */
+h2.wpbb-forum-title a {
+    font-weight:bold;
+    color:purple;
 }
 
@@ -184 +192 @@
     min-width: 500px;
     white-space: pre-line;
+    text-align:left;
 }
 

wp-bulletin-board/tags/1.1.0/php/facebook/wpbb-facebook.php

@@ -9 +9 @@
 $user_id = get_current_user_id();
 
-if ($user_id !== 0) { // User is logged in
-
+if ($user_id !== 0)
+{
+    // User is logged in
     $user_access_token = get_user_meta($user_id, 'wpbb_facebook_access_token', true);
-
-    if ($user_access_token != "" && is_user_logged_in()) { // User is logged into Facebook
-    
+    if ($user_access_token != "" && is_user_logged_in())
+    {
+        // User is logged into Facebook
         $logged_into_facebook = true;
-
-        if (count($_GET) == 0) {
+        if (count($_GET) == 0)
+        {
         ?>
         <div class="wpbb-centered">
@@ -25 +26 @@
         <?php
         }
-    
-    } 
-    
-    
-} else { // User is not logged in
-    
-    // Registering for a Wordpress account through Facebook
+    }
+} 
+else
+{ 
+    /* 
+        User is not logged in
+        Registering for a Wordpress account through Facebook 
+    */
     if ((isset($_GET['register'])) && (isset($_GET['method'])) && (count($_GET) == 2)) {
     
@@ -130 +132 @@
                         <br />
                         <div class="wpbb-centered">
-                            <?php printf(__('Thankyou for logging in to Facebook, %s!'), $facebook_user['name']); ?>
+                            <?php printf(__('Thank you for logging in to Facebook, %s!'), $facebook_user['name']); ?>
                             <br /><br />
                             <?php _e('Please now enter the password for your Wordpress account you registered using Facebook.', 'wp-bb'); ?><br /><br /><?php
@@ -238 +240 @@
         <div class="wpbb-message-success">
             <?php
-            _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+            _e('Thank you for registering. Please login with your Facebook username and password you just created', 'wp-bb');
             ?>
         </div>

wp-bulletin-board/tags/1.1.0/php/twitter/wpbb-twitter.php

@@ -5 +5 @@
 */
 
-if (count($_GET) == 0) {
+if (count($_GET) == 0)
+{
     ?>
     <div class="wpbb-centered">

wp-bulletin-board/tags/1.1.0/php/wpbb-forum.php

@@ -4 +4 @@
     Checks if the plugin is deactivated
 */
-
 
 // Since we're not in the admin area we must require the plugin.php file
@@ -18 +17 @@
     <div style="text-align:center;font-weight:bold;color:red;">
         <?php
-            _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB', 'wp-bb');
+            _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB or delete this page', 'wp-bb');
             wpbb_exit();
         ?>
@@ -35 +34 @@
 
 // Sets the default timezone used by all date/time functions in a script depending on server configuration option
-if (ini_get('date.timezone.')) {
+if (ini_get('date.timezone.'))
+{
     $timezone = ini_get('date.timezone');
     date_default_timezone_set($timezone);
@@ -48 +48 @@
 define('POST_TABLE', $wpdb->prefix.'wpbb_posts');
 define('MESSAGES_TABLE', $wpdb->prefix.'wpbb_messages');
+define('UN_READ_TABLE', $wpdb->prefix.'wpbb_topics_unread');
 
 // The WP-BB plugin url on wordpress - only used if show footer option is set to yes
@@ -53 +54 @@
 
 
-function wpbb_exit() {
+function wpbb_exit()
+{
     get_header();
     get_footer();
@@ -63 +65 @@
     && (!is_user_logged_in())
     && (!isset($_GET['method']))
-    && (!isset($_GET['state']))) {
-    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+    && (!isset($_GET['state'])))
+    {
+    if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+    {
         require_once('facebook/wpbb-facebook.php');
     }
-    require_once('wpbb-functions.php');
+    require_once('functions.php');
     ?>
     <div class="wpbb-centered-bold">
@@ -77 +81 @@
 }
 
-if ($wpbb_options['maintenance_mode'] == 'on') {
-    if (current_user_can('manage_options')) {
+if ($wpbb_options['maintenance_mode'] == 'on')
+{
+    if (current_user_can('manage_options'))
+    {
         ?>
         <div class="wpbb-message-warning">
@@ -84 +90 @@
         </div>
         <?php
-    } else {
+    }
+    else
+    {
         ?>
         <div class="wpbb-message-warning">
@@ -90 +98 @@
         </div>
         <?php
-        if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+        if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+        {
             require_once('facebook/wpbb-facebook.php');
         }
-        require_once('wpbb-functions.php');
+        require_once('functions.php');
         wpbb_footer();
         wpbb_exit();
@@ -103 +112 @@
 */
 
-require_once('wpbb-functions.php');
-
-/* 
+require_once('functions.php');
+
+/*
     Checks a page supplied exists
 */
@@ -115 +124 @@
 */
 
-if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+{
     require_once('facebook/wpbb-facebook.php');
 }
@@ -126 +136 @@
 $wpbb_twitter_options = get_option('wpbb_twitter_options');
 
-if ($wpbb_twitter_options['allow_twitter'] == 'yes') {
+if ($wpbb_twitter_options['allow_twitter'] == 'yes')
+{
     require_once('twitter/wpbb-twitter.php');
 }
@@ -138 +149 @@
 */
 
+
 if (empty($permalink_options))
 { 
-    if (count($_GET) == 1) {
-        require_once('wpbb-index.php');
-    }
-
+    if (count($_GET) == 1)
+    {
+        require_once('forum-index.php');
+    }
 
     /*
@@ -152 +164 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-forum.php');
+        require_once('view-forum.php');
     }
     
@@ -165 +177 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-forum-topic.php');
-    }
-
+        require_once('view-forum-topic.php');
+    }
 
     /*
@@ -177 +188 @@
         && (isset($_GET['forum']) && isset($_GET['subforum']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-create-topic.php');
+        require_once('create-topic.php');
     }
 
@@ -184 +195 @@
         && (isset($_GET['forum']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-create-topic.php');
-    }
-
+        require_once('create-topic.php');
+    }
 
     /*
@@ -197 +207 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-subforum.php');
+        require_once('view-subforum.php');
     }
 
@@ -211 +221 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 5)) {
-        require_once('wpbb-view-subforum-topic.php');
+        require_once('view-subforum-topic.php');
     }
 
@@ -221 +231 @@
         && (isset($_GET['page_id']))
         && (count($_GET) == 2)) {
-        require_once('wpbb-view-profile.php');
+        require_once('view-profile.php');
     }
 
@@ -232 +242 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-all-messages.php');
+        require_once('all-messages.php');
     }
     
@@ -243 +253 @@
         && (isset($_GET['page_id']))
         && (count($_GET) > 1 && count($_GET) <= 3)) {
-        require_once('wpbb-delete-message.php');
+        require_once('delete-message.php');
     }
 
@@ -255 +265 @@
         && ((isset($_GET['view'])) && ($_GET['view']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-message.php');
+        require_once('view-message.php');
     }
 
@@ -265 +275 @@
         && (isset($_GET['page_id']))
         && (count($_GET) == 2)) {
-        require_once('wpbb-message-user.php');
+        require_once('message-user.php');
     }
 
@@ -281 +291 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-edit-topic.php');
+        require_once('edit-topic.php');
     }
 
@@ -297 +307 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-lock-topic.php');
+        require_once('lock-topic.php');
     }
 
@@ -313 +323 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'edit')))) {
-        require_once('wpbb-sticky-topic.php');
+        require_once('sticky-topic.php');
     }
 
@@ -329 +339 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-delete-topic.php');
+        require_once('delete-topic.php');
     }
 
@@ -346 +356 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-markread-topic.php');
+        require_once('markread-topic.php');
     }
 
@@ -363 +373 @@
         && ($_GET['action'] != 'edit')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-reply-topic.php');
+        require_once('reply-topic.php');
     }
 
@@ -375 +385 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-unread-topics.php');
+        require_once('unread-topics.php');
     }
 
@@ -387 +397 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-unanswered-topics.php');
+        require_once('unanswered-topics.php');
     }
     
     // Not default or custom structure
 
-} else {
-
-    if (count($_GET) == 0) {
-        require_once('wpbb-index.php');
+} 
+else
+{
+    if (count($_GET) == 0)
+    {
+        require_once('forum-index.php');
     }
 
@@ -405 +417 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-view-forum.php');
-    }
-
-
-
+        require_once('view-forum.php');
+    }
+    
     /*
         Viewing A Forum Topic
@@ -418 +428 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-forum-topic.php');
+        require_once('view-forum-topic.php');
     }
 
@@ -429 +439 @@
         && (isset($_GET['forum']) && isset($_GET['subforum']) || isset($_GET['forum']) && !isset($_GET['subforum']))
         && (count($_GET) == 2 || count($_GET) == 3)) {
-            require_once('wpbb-create-topic.php');
+            require_once('create-topic.php');
     }
 
@@ -440 +450 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-subforum.php');
+        require_once('view-subforum.php');
     }
 
@@ -453 +463 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-subforum-topic.php');
+        require_once('view-subforum-topic.php');
     }
 
@@ -462 +472 @@
     if ((isset($_GET['profile']))
         && (count($_GET) == 1)) {
-        require_once('wpbb-view-profile.php');
+        require_once('view-profile.php');
     }
 
@@ -474 +484 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 2 || count($_GET) == 3)) {
-        require_once('wpbb-all-messages.php');
+        require_once('all-messages.php');
     }
     
@@ -485 +495 @@
         && (isset($_GET['delete_msg']))
         && (count($_GET) > 1 && count($_GET) <= 2)) {
-        require_once('wpbb-delete-message.php');
+        require_once('delete-message.php');
     }
     /*
@@ -495 +505 @@
         && ((isset($_GET['view']))
         && (count($_GET) == 2))) {
-        require_once('wpbb-view-message.php');
+        require_once('view-message.php');
     }
 
@@ -504 +514 @@
     if ((isset($_GET['message']))
         && (count($_GET) == 1)) {
-        require_once('wpbb-message-user.php');
+        require_once('message-user.php');
     }
 
@@ -519 +529 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-edit-topic.php');
+        require_once('edit-topic.php');
     }
 
@@ -534 +544 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-lock-topic.php');
+        require_once('lock-topic.php');
     }
 
@@ -549 +559 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'edit')))) {
-        require_once('wpbb-sticky-topic.php');
+        require_once('sticky-topic.php');
     }
 
@@ -564 +574 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-delete-topic.php');
+        require_once('delete-topic.php');
     }
 
@@ -574 +584 @@
         && (isset($_GET['topic']))
         && ((isset($_GET['action']) 
-        && ($_GET['action'] == 'markread') 
+        && ($_GET['action'] == 'markread')
         && ($_GET['action'] != 'delete')
         && ($_GET['action'] != 'lock') 
@@ -580 +590 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-markread-topic.php');
+        require_once('markread-topic.php');
     }
 
@@ -596 +606 @@
         && ($_GET['action'] != 'edit')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-reply-topic.php');
+        require_once('reply-topic.php');
     }
 
@@ -607 +617 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-unread-topics.php');
+        require_once('unread-topics.php');
     }
 
@@ -618 +628 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-unanswered-topics.php');
+        require_once('unanswered-topics.php');
     }
 }

wp-bulletin-board/tags/1.1.0/readme.txt

@@ -3 +3 @@
 Donate link: http://codebycarter.x10.mx/wp/donate/
 Tags: forum, bulletin board, twitter, facebook, discussion, discussion board, messaging, private message, topic, post, pagination, profile, subforum, wpbb
-Requires at least: 3.3
-Tested up to: 3.4.2
-Stable tag: 1.0.4
+Requires at least: 3.0
+Tested up to: 3.5
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -18 +18 @@
 
 = Features =
-* - Ease of Integration - WPBB creates a template file for your current template when you install or change your theme so you don't have to do anything. Everything can be managed from your admin area.
-* - Translatable - WPBB can easily be translated into your preferred language!
-* - Facebook registration - Allow your users to register on your Wordpress site via Facebook. This automatically creates a WP account for your Facebook users which they can then login to after authenticating.
-* - Twitter - Enter your twitter account in your settings and your users will be able to follow your website / personal account with the click of a button.
-* - Private Messaging System - Allow users to send messages to each other.
-* - Member Profiles - All your WP users are automatically  apart of your forum whenever you create it and have a "forum profile" which can be viewed on the forum which shows the users avatar, username, role, posts, website and signature. Signatures are apart of WPBB and allow your users to enter a signature which can be text or images and is displayed below their profile and posts.
-* - Categories, Forums, Sub forums - Organise your forums into categories and your sub forums into forums. There is no limit to the amount of forums its parent can have, and each are ordered by its appearance in its parent.
-* - Permissions system - Currently supports the ability to allow or disallow any role (even custom roles!) any specific permission (edit, view, read, post, reply, lock, delete, sticky). WPBB grabs all known roles from your WP site which you can set permissions for manually or copy existing permissions from a previous forum.
-* - Topics - If you have the permissions to do so you can edit, lock, delete, sticky, view, read, post or reply with a topic.
-* - Posts - You can edit and delete any post and the posts topic affects the posts status. You can create posts in two ways, creating a topic reply with presents the WP editor for improved formatting or you can use the quick reply feature (if it is enabled in your settings).
-* - Pagination System - Supports a simple pagination system which organises your topics and posts - you can set the max topics/posts per page in your wpbb settings.
-* - Unread Topics - WPBB collects a list of topics which have been posted when you were offline and displays them for you. You can mark any of them as read once you've read them.
-* - Unanswered Topics - Similar to the above feature, unanswered topics are ones which haven't yet received any replies.
-* - Admin area - The WPBB settings integrate with your existing WP admin area where you can easily manage your forums with ease. The WPBB overview allows you to change the order of a category, forum or sub forum, edit it and delete it with a single click. You can also create new categories, forums, sub forums and topics via the admin area.
-* - Settings - WPBB is jam packed with settings that you can use to customise the forum any way you want to.
+* Compatibility - Fully compatible with 3.5, 3.4, 3.3, 3.2, 3.1 and 3.0
+* Ease of Integration - WPBB works with any theme, you can change your theme anytime and WPBB will automatically update itself.
+* Translatable - WPBB can easily be translated into your preferred language!
+* Facebook registration - Allow your users to register on your Wordpress site via Facebook. This automatically creates a WP account for your Facebook users which they can then login to after authenticating.
+* Twitter - Enter your twitter account in your settings and your users will be able to follow your website / personal account with the click of a button.
+* Private Messaging System - Allow users to send messages to each other.
+* Member Profiles - All your WP users are automatically  apart of your forum whenever you create it and have a "forum profile" which can be viewed on the forum which shows the users avatar, username, role, posts, website and signature. Signatures are apart of WPBB and allow your users to enter a signature which can be text or images and is displayed below their profile and posts.
+* Categories, Forums, Sub forums - Organise your forums into categories and your sub forums into forums. There is no limit to the amount of forums its parent can have, and each are ordered by its appearance in its parent.
+* Permissions system - Currently supports the ability to allow or disallow any role (even custom roles!) any specific permission (edit, view, read, post, reply, lock, delete, sticky). WPBB grabs all known roles from your WP site which you can set permissions for manually or copy existing permissions from a previous forum.
+* Role Permissions - New in 1.1. Allows you to choose whether a role can only edit, lock, delete and sticky their own topics or everyones.
+* Topics - If you have the permissions to do so you can edit, lock, delete, sticky, view, read, post or reply with a topic.
+* Posts - You can edit and delete any post and the posts topic affects the posts status. You can create posts in two ways, creating a topic reply with presents the WP editor for improved formatting or you can use the quick reply feature (if it is enabled in your settings).
+* Pagination System - Supports a simple pagination system which organises your topics and posts - you can set the max topics/posts per page in your wpbb settings.
+* Unread Topics - WPBB collects a list of topics which have been posted when you were offline and displays them for you. You can mark any of them as read once you've read them.
+* Unanswered Topics - Similar to the above feature, unanswered topics are ones which haven't yet received any replies.
+* Admin area - The WPBB settings integrate with your existing WP admin area where you can easily manage your forums with ease. The WPBB overview allows you to change the order of a category, forum or sub forum, edit it and delete it with a single click. You can also create new categories, forums, sub forums and topics via the admin area.
+* Settings - WPBB is jam packed with settings that you can use to customise the forum any way you want to.
+* Tools - Tools help make your life easier. Tools such as updating your roles whenever you add, change or remove them and a tool to recreate the forum page if you ever accidentally delete it.
 
-And many more...
+And much much more!
 
 == Installation ==
@@ -60 +63 @@
 Firstly always download the plugin again as the plugin is constantly updated. It is likely the problem you're having has been fixed already. If that doesn't work, create a topic here: http://wordpress.org/support/plugin/wp-bulletin-board
 
+= How to Setup Facebook Integration =
+
+1. https://developers.facebook.com/apps (register or login)
+2. "Create New App"
+3. Enter App Name, can be anything you want, don't worry about app namespace or web hosting. Click continue.
+4. Facebook should've created the app for you and you'll see at the top the name of your app and the default avatar, next to that there is your App ID and App Secret Key. Enter those into your WPBB facebook settings.
+5. You may want to enter a contact email and change any other settings to your liking but leave sandbox mode disabled and don't use the "Hosting URL"
+6. Click "Website with Facebook Login" under "Select how your app integrates with Facebook" then enter the URL to your wpbb forum e.g. http://mysite.com/wordpress/forum
+7. Save changes
+
+= When I edit and save my forum or subforum, there is an error =
+
+It is likely that you are updating a forum with roles that no longer exist. Go to your admin dashboard -> WPBB -> Tools -> Refresh Roles. Use this tool whenever you add, change or remove roles. Roles are like the ranks or capabilities that users have, e.g. subscriber, author, administrator, etc.
+
 == Screenshots ==
 
@@ -71 +88 @@
 
 == Changelog ==
+
+= 1.1.0 =
+* Role permissions added which allow you to set whether a role can edit, lock, delete or sticky only their own topics or posts or everyones.
+* Now compatible with wordpress versions 3.0, 3.1, 3.2, 3.3 and 3.5
+* Fixes error in topic post editor
+* (un)read topics are now used per user instead of globally as it should be
+* Removed unneccessary forum prefix setting as you can include 'forum' in your own title
+* Fixed post count not changing when deleting topics and/or posts and when editing topics and posts.
+* Fixes a number of bugs translators encountered when trying to translate wpbb
+* Clicking the search box now clears the textbox, more javascript will be added in the future for those that use it
+* Added useful descriptions next to all the settings in the wpbb settings.
+* New tool added which allows you to recreate your forums page if it was accidentally deleted or didn't create for some reason
+* Last post/reply will now take you to that topic or post
+* You can no longer create empty topics, posts or messages or give them empty titles
+* You can now go straight to your newly created topic or post when creating a topic or reply.
+* Updated FAQ
+* Minor bug fixes and typos fixed.
 
 = 1.0.4 =

wp-bulletin-board/tags/1.1.0/wp-bb.php

@@ -4 +4 @@
     Plugin URI: http://wordpress.org/extend/plugins/wp-bulletin-board/
     Description: An easy to use Bulletin board for Wordpress with Facebook and Twitter integration.
-    Version: 1.0.4
+    Version: 1.1.0
     Author: Jay Carter
     Author URI: http://codebycarter.com
@@ -29 +29 @@
 
 // Sets the default timezone used by all date/time functions in a script depending on server configuration option
-if (ini_get('date.timezone.')) {
+if (ini_get('date.timezone.'))
+{
     $timezone = ini_get('date.timezone');
     date_default_timezone_set($timezone);
@@ -35 +36 @@
 
 // Define wpbb plugin directory
-define('WPBB_DIR', plugin_dir_path(__FILE__));
+if (!defined('WPBB_DIR'))
+{
+    define('WPBB_DIR', plugin_dir_path(__FILE__));
+}
 // Contains categories, forums and subforums
-define('CATEGORY_TABLE', $wpdb->prefix.'wpbb_categories');
+if (!defined('CATEGORY_TABLE'))
+{
+    define('CATEGORY_TABLE', $wpdb->prefix.'wpbb_categories');
+}
 // Contains all topics whether in a category, forum or subforum
-define('TOPICS_TABLE', $wpdb->prefix.'wpbb_topics');
+if (!defined('TOPICS_TABLE'))
+{
+    define('TOPICS_TABLE', $wpdb->prefix.'wpbb_topics');
+}
 // Contains all posts inside a specific topic
-define('POSTS_TABLE', $wpdb->prefix.'wpbb_posts');
+if (!defined('POSTS_TABLE'))
+{
+    define('POSTS_TABLE', $wpdb->prefix.'wpbb_posts');
+}
 // Contains all user messages
-define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
+if (!defined('MESSAGE_TABLE'))
+{
+    define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
+}
+// Contains all topics for each user and whether they are read or not
+if (!defined('UNREAD_TABLE'))
+{
+    define('UNREAD_TABLE', $wpdb->prefix.'wpbb_topics_unread');
+}
 // Define current version
-define('WPBB_VERSION', 'v1.0.4');
+if (!defined('WPBB_VERSION'))
+{
+    define('WPBB_VERSION', 'v1.1.0');
+}
 // Define plugin url (wp plugin page)
-define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
+if (!defined('WPBB_PLUGIN_URL'))
+{
+    define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
+}
 
 /*
@@ -53 +80 @@
 */
 
-function wpbb_load_language() {
-    load_plugin_textdomain('wp-bb', false, dirname(plugin_basename(__FILE__)).'/languages/');
-}
 add_action('plugins_loaded', 'wpbb_load_language');
+
+if (!function_exists('wpbb_load_language'))
+{
+    function wpbb_load_language()
+    {
+        load_plugin_textdomain('wp-bb', false, dirname(plugin_basename(__FILE__)).'/languages/');
+    }
+}
 
 /*
@@ -75 +107 @@
 add_action('wp_enqueue_scripts', 'wpbb_register_styles');
 
+$options = get_option('wpbb_options');
+if ($options['post_to_forum'] == 'yes')
+{
+    add_action('add_meta_boxes', 'wpbb_create_metaboxes'); // Metaboxes
+    add_action('save_post', 'wpbb_post_saved'); // Wordpress post saved
+}
+
 /*
     All WPBB Admin (Non Page or DB related) Functions
@@ -81 +120 @@
 */
 
-require_once('php/admin/wpbb-admin-functions.php');
+require_once('php/admin/admin-functions.php');
 
 /*
@@ -87 +126 @@
 */
 
-function wpbb_activate() {
-    // Create all neccessary database tables
-    wpbb_create_db_table();
-    // Create options in DB for our settings
-    wpbb_create_options();
-    // Create the user meta for all users currently registered
-    wpbb_setup_user_meta();
-    // Creates the Forum page
-    wpbb_create_page();
+if (!function_exists('wpbb_activate'))
+{
+    function wpbb_activate()
+    {
+        // Create all neccessary database tables
+        wpbb_create_db_table();
+        // Create options in DB for our settings
+        wpbb_create_options();
+        // Create the user meta for all users currently registered
+        wpbb_setup_user_meta();
+        // Creates the Forum page
+        wpbb_create_page();
+    }
 }
 
@@ -102 +145 @@
 */
 
-function wpbb_uninstall() {
-    global $wpdb;
-    // Delete main options from database
-    delete_option('wpbb_options');
-    // Delete theme options
-    delete_option('wpbb_theme_options');
-    // Delete facebook options
-    delete_option('wpbb_facebook_options');
-    // Delete twitter options
-    delete_option('wpbb_twitter_options');
-    // Delete guest options
-    delete_option('wpbb_guest_options');
-    // Delete the user meta
-    wpbb_delete_user_meta();
-    // Delete post meta (this function is in wpbb-functions.php as the page is created in wpbb-forum.php)
-    wpbb_delete_post_meta();
-    // Delete database tables
-    $wpdb->query("DROP TABLE ".CATEGORY_TABLE.", ".TOPICS_TABLE.", ".POSTS_TABLE.", ".MESSAGE_TABLE.";");
-}
-
-function wpbb_delete_user_meta() {
-    global $wpdb;
-    $delete_user_meta = $wpdb->query("DELETE FROM ".$wpdb->prefix."usermeta WHERE meta_key LIKE 'wpbb_%';");
-}
-
-function wpbb_delete_post_meta() {
-    global $wpdb;
-    $post_meta = $wpdb->prefix.'postmeta';
-    $key = '_wp_page_template';
-    $value = 'wpbb-template.php';
-    $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '$key' AND meta_value = '$value';");
-    // Delete the meta data
-    delete_post_meta($post_id, $key, $value);
-    // Delete the page
-    wp_delete_post($post_id, true);
+if (!function_exists('wpbb_uninstall'))
+{
+    function wpbb_uninstall()
+    {
+        global $wpdb;
+        delete_option('wpbb_options');
+        delete_option('wpbb_theme_options');
+        delete_option('wpbb_facebook_options');
+        delete_option('wpbb_twitter_options');
+        delete_option('wpbb_guest_options');
+        wpbb_delete_user_meta();
+        wpbb_delete_post_meta();
+        $wpdb->query("DROP TABLE ".CATEGORY_TABLE.", ".TOPICS_TABLE.", ".POSTS_TABLE.", ".MESSAGE_TABLE.", ".UNREAD_TABLE.";");
+    }
+}
+
+if (!function_exists('wpbb_delete_user_meta'))
+{
+    function wpbb_delete_user_meta()
+    {
+        global $wpdb;
+        $delete_user_meta = $wpdb->query("DELETE FROM ".$wpdb->prefix."usermeta WHERE meta_key LIKE 'wpbb_%';");
+    }
+}
+
+if (!function_exists('wpbb_delete_post_meta'))
+{
+    function wpbb_delete_post_meta()
+    {
+        global $wpdb;
+        $post_meta = $wpdb->prefix.'postmeta';
+        $key = '_wp_page_template';
+        $value = 'wpbb-template.php';
+        $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '$key' AND meta_value = '$value';");
+        // Delete the meta data
+        delete_post_meta($post_id, $key, $value);
+        // Delete the page
+        wp_delete_post($post_id, true);
+    }
 }
 
@@ -143 +190 @@
 */
 
-function wpbb_create_db_table() {
-
-    global $wpdb;
-    
-    $options = get_option('wpbb_options');
-    
-    // This is not being activated the first time
-    //if (isset($options['version']) && $options['version'] != WPBB_VERSION) {
-    if ($options) {
-    
-        wpbb_refresh_roles();
-        
-    } else {
-        
+if (!function_exists('wpbb_create_db_table'))
+{
+    function wpbb_create_db_table()
+    {
+        global $wpdb;
+        $options = get_option('wpbb_options');
+        if ($options)
+        {
+            wpbb_refresh_roles();
+        }
         $roles = wpbb_admin_get_all_roles('string', true);
-    
         $perms = "SET($roles) NOT NULL";
-        
         $create_category_query = "CREATE TABLE ".CATEGORY_TABLE." (
             `id` TINYINT(1) UNSIGNED NOT NULL AUTO_INCREMENT,
-            `name` VARCHAR(25) NOT NULL,
+            `name` VARCHAR(30) NOT NULL,
             `description` VARCHAR(200) NOT NULL,
             `forum` TINYINT(1) NOT NULL,
@@ -183 +224 @@
             `id` INT(1) NOT NULL AUTO_INCREMENT,
             `author` SMALLINT(1) NOT NULL,
-            `name` VARCHAR(25) NOT NULL,
+            `name` VARCHAR(35) NOT NULL,
             `content` TEXT NULL,
             `forum` TINYINT(1) NOT NULL,
@@ -215 +256 @@
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
         ";
+    
+        $create_topic_unread_query = "CREATE TABLE ".UNREAD_TABLE." (
+            `id` INT(1) NOT NULL,
+            `author` INT(1) NOT NULL,
+            `read` INT(1) NOT NULL
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+        ";
       
         $create_category_table = $wpdb->query($create_category_query);
@@ -220 +268 @@
         $create_post_table = $wpdb->query($create_post_query);
         $create_message_table = $wpdb->query($create_messages_query);
+        $create_topic_unread_table = $wpdb->query($create_topic_unread_query);
     
-        if ($create_category_table === false) {
+        if ($create_category_table === false)
+        {
             $create_category_table_err = __('There was an error creating the table wpbb_categorie', 'wp-bb');
-            error_log($create_category_table_err);
+            error_log($create_category_table_err);
         } 
-        if ($create_topic_table === false) {
+        if ($create_topic_table === false)
+        {
             $create_topic_table_err = __('There was an error creating the table wpbb_topics', 'wp-bb');
             error_log($create_topic_table_err);
         }
-        if ($create_post_table === false) {
+        if ($create_post_table === false)
+        {
             $create_post_table_err = __('There was an error creating the table wpbb_posts', 'wp-bb');
             error_log($create_post_table_err);
         } 
-        if ($create_message_table === false) {
+        if ($create_message_table === false)
+        {
             $create_message_table_err = __('There was an error creating the table wpbb_messages', 'wp-bb');
             error_log($create_message_table_err);
         }
+        if ($create_topic_unread_table === false)
+        {
+            $create_topic_unread_table_err = __('There was an error creating the table wpbb_topics_unread', 'wp-bb');
+            error_log($create_topic_unread_table_err);
+        }
     }
 }
@@ -244 +302 @@
 */
 
-function wpbb_create_options() {
-    // Retrieve options from database
-    $old_options = get_option('wpbb_options');
-    // If options do not exist
-    if (!$old_options) {
-        $maintenance_message = __('This is the message that will be displayed to users when you disable the board. Edit this in your settings.', 'wp-bb');
-        $forum_name = __('My WPBB Forum', 'wp-bb');
-        $options = array(
-            'maintenance_mode' => 'off',
-            'maintenance_message' => $maintenance_message,
-            'forum_name' => $forum_name,
-            'forum_prefix' => 'no',
-            'allow_guests' => 'yes',
-            'allow_subforums' => 'yes',
-            'enable_quick_reply' => 'yes',
-            'topics_per_page' => 20,
-            'posts_per_page' => 20,
-            'topic_cutoff' => 15,
-            'post_cutoff' => 15,
-            'post_to_forum' => 'yes',
-            'show_footer' => 'no',
-            'version' => WPBB_VERSION
-        );
-        $add_wpbb_options = add_option('wpbb_options', $options);
-    } else {
-        if (!isset($old_options['version'])) {
-            // Attempting to update a key in the options value will remove all the other keys so we must
-            // set all the other keys as well
+if (!function_exists('wpbb_create_options'))
+{
+    function wpbb_create_options()
+    {
+        // Retrieve options from database
+        $old_options = get_option('wpbb_options');
+        /*
+        *   Add all current roles to an array with a default value of 'yes'
+        *   This is for our role permissions
+        */
+        $roles = wpbb_admin_get_all_roles();
+        $role_array = array();
+        if ($roles)
+        {
+            foreach ($roles as $role)
+            {
+                $role_array[$role] = 'yes';
+            }
+        }
+        // If options do not exist
+        if (!$old_options)
+        {
+            $maintenance_message = __('This is the message that will be displayed to users when you disable the board. Edit this in your settings.', 'wp-bb');
+            $forum_name = __('My WPBB Forum', 'wp-bb');
             $options = array(
-                'maintenance_mode' => $old_options['maintenance_mode'],
-                'maintenance_message' => $old_options['maintenance_message'],
-                'forum_name' => $old_options['forum_name'],
-                'forum_prefix' => $old_options['forum_prefix'],
-                'allow_guests' => $old_options['allow_guests'],
-                'allow_subforums' => $old_options['allow_subforums'],
-                'enable_quick_reply' => $old_options['enable_quick_reply'],
-                'topics_per_page' => $old_options['topics_per_page'],
-                'posts_per_page' => $old_options['posts_per_page'],
-                'topic_cutoff' => $old_options['topic_cutoff'],
-                'post_cutoff' => $old_options['post_cutoff'],
-                'post_to_forum' => $old_options['post_to_forum'],
-                'show_footer' => $old_options['show_footer'],
+                'maintenance_mode' => 'off',
+                'maintenance_message' => $maintenance_message,
+                'forum_name' => $forum_name,
+                'allow_guests' => 'yes',
+                'allow_subforums' => 'yes',
+                'enable_quick_reply' => 'yes',
+                'topics_per_page' => 20,
+                'posts_per_page' => 20,
+                'topic_cutoff' => 15,
+                'post_cutoff' => 15,
+                'post_to_forum' => 'yes',
+                'show_footer' => 'no',
+                'role_permissions' => $role_array,
                 'version' => WPBB_VERSION
             );
-            update_option('wpbb_options', $options);
-        }
-    }
-    /* Theme Options */
-    $old_theme_options = get_option('wpbb_theme_options');
-    if (!$old_theme_options) {
-        $add_wpbb_theme_options = add_option('wpbb_theme_options', array('theme' => 'light'));
-    }
-    /* Facebook Options */
-    $old_facebook_options = get_option('wpbb_facebook_options');
-    if (!$old_facebook_options) {
-        $facebook_app_id = __('Enter your Facebook App ID / API Key', 'wp-bb');
-        $facebook_app_secret_key = __('Enter your App Secret Key', 'wp-bb');
-        $facebook_redirect_uri = __('Enter your URL (Redirect URL)', 'wp-bb');
-        $facebook_state = __('Enter a long random string', 'wp-bb');
-        $facebook_role = __('Enter the default role for new facebook registrations');
-        $facebook_options = array(
-            'allow_facebook' => 'no',
-            'facebook_app_id' => $facebook_app_id,
-            'facebook_app_secret_key' => $facebook_app_secret_key,
-            'facebook_redirect_uri' => $facebook_redirect_uri,
-            'facebook_state' => $facebook_state,
-            'facebook_default_role' => $facebook_role
-        );
-        $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
-    }
-    /* Twitter Options */
-    $old_twitter_options = get_option('wpbb_twitter_options');
-    if (!$old_twitter_options) {
-        $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
-        $twitter_options = array(
-            'allow_twitter' => 'no',
-            'twitter_account' => $twitter_account
-        );
-        $add_wpbb_twitter_options = add_option('wpbb_twitter_options', $twitter_options);
-    }
-    $old_guest_options = get_option('wpbb_guest_options');
-    if (!$old_guest_options) {
-        $guest_options = array(
-            'guest_last_post' => '0000-00-00 00:00:00'
-        );
-        $add_wpbb_guest_options = add_option('wpbb_guest_options', $guest_options);
+            $add_wpbb_options = add_option('wpbb_options', $options);
+        }
+        else
+        {
+            if (!isset($old_options['version']))
+            {
+                $options = array(
+                    'maintenance_mode' => $old_options['maintenance_mode'],
+                    'maintenance_message' => $old_options['maintenance_message'],
+                    'forum_name' => $old_options['forum_name'],
+                    'allow_guests' => $old_options['allow_guests'],
+                    'allow_subforums' => $old_options['allow_subforums'],
+                    'enable_quick_reply' => $old_options['enable_quick_reply'],
+                    'topics_per_page' => $old_options['topics_per_page'],
+                    'posts_per_page' => $old_options['posts_per_page'],
+                    'topic_cutoff' => $old_options['topic_cutoff'],
+                    'post_cutoff' => $old_options['post_cutoff'],
+                    'post_to_forum' => $old_options['post_to_forum'],
+                    'show_footer' => $old_options['show_footer'],
+                    'role_permissions' => $role_array,
+                    'version' => WPBB_VERSION
+                );
+                update_option('wpbb_options', $options);
+            }
+        }
+        /* Theme Options */
+        $old_theme_options = get_option('wpbb_theme_options');
+        if (!$old_theme_options)
+        {
+            $add_wpbb_theme_options = add_option('wpbb_theme_options', array('theme' => 'light'));
+        }
+        /* Facebook Options */
+        $old_facebook_options = get_option('wpbb_facebook_options');
+        if (!$old_facebook_options) {
+            $facebook_app_id = __('Enter your Facebook App ID / API Key', 'wp-bb');
+            $facebook_app_secret_key = __('Enter your App Secret Key', 'wp-bb');
+            $facebook_redirect_uri = __('Enter your URL (Redirect URL)', 'wp-bb');
+            $facebook_state = __('Enter a long random string', 'wp-bb');
+            $facebook_role = __('Enter the default role for new facebook registrations');
+            $facebook_options = array(
+                'allow_facebook' => 'no',
+                'facebook_app_id' => $facebook_app_id,
+                'facebook_app_secret_key' => $facebook_app_secret_key,
+                'facebook_redirect_uri' => $facebook_redirect_uri,
+                'facebook_state' => $facebook_state,
+                'facebook_default_role' => $facebook_role
+            );
+            $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
+        }
+        /* Twitter Options */
+        $old_twitter_options = get_option('wpbb_twitter_options');
+        if (!$old_twitter_options)
+        {
+            $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
+            $twitter_options = array(
+                'allow_twitter' => 'no',
+                'twitter_account' => $twitter_account
+            );
+            $add_wpbb_twitter_options = add_option('wpbb_twitter_options', $twitter_options);
+        }
+        $old_guest_options = get_option('wpbb_guest_options');
+        if (!$old_guest_options)
+        {
+            $guest_options = array(
+                'guest_last_post' => '0000-00-00 00:00:00'
+            );
+            $add_wpbb_guest_options = add_option('wpbb_guest_options', $guest_options);
+        }
     }
 }
@@ -337 +417 @@
 */
 
-function wpbb_admin_pages() {
-    
-    $create_category = __('Create Category', 'wp-bb');
-    $create_forum = __('Create Forum', 'wp-bb');
-    $create_subforum = __('Create Subforum', 'wp-bb');
-    $create_topic = __('Create Topic', 'wp-bb');
-    $create_tools = __('Tools', 'wp-bb');
-    $faq_support = __('FAQ & Support', 'wp-bb');
-    $settings = __('WPBB Settings', 'wp-bb');
-
-    // Main WPBB page
-    add_menu_page('WPBB Overview', 'WPBB', 'manage_options', 'wpbb_admin', 'wpbb_admin_display', '', 26);
-    
-    // Create/Edit Category
-    add_submenu_page('wpbb_admin', 'WPBB Categories', $create_category, 'manage_options', 'wpbb_admin_categories', 'wpbb_admin_categories');
-    
-    // Create/Edit Forum
-    add_submenu_page('wpbb_admin', 'WPBB Forums', $create_forum, 'manage_options', 'wpbb_admin_forums', 'wpbb_admin_forums');
-    
-    // Create/Edit Subforum
-    add_submenu_page('wpbb_admin', 'WPBB Subforums', $create_subforum, 'manage_options', 'wpbb_admin_subforums', 'wpbb_admin_subforums');
-    
-    // Create/Edit Topics
-    add_submenu_page('wpbb_admin', 'WPBB Topics', $create_topic, 'manage_options', 'wpbb_admin_topics', 'wpbb_admin_topics');
-    
-    // Create Tools page
-    add_submenu_page('wpbb_admin', 'WPBB Tools', $create_tools, 'manage_options', 'wpbb_admin_tools', 'wpbb_admin_tools');
-    
-    // FAQ / First Installation Page
-    add_submenu_page('wpbb_admin', 'FAQ / Support', $faq_support, 'manage_options', 'wpbb_admin_help', 'wpbb_admin_help');
-    
-    // WPBB Settings
-    add_options_page('WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
-}
-
-function wpbb_create_template_file() {
-    // Get current theme directory
-    $template_directory = get_template_directory();
-    // Check if required template file doesn't exist and if true create it
-    if (!file_exists($template_directory.'/wpbb-template.php')) {
-        // Check directory is writable
-        if (is_writable($template_directory)) { 
-            // Copys wp-bb template file to your current theme
-            $template_file_path = WPBB_DIR.'/wpbb-template.php';
-            $move_template_file = copy($template_file_path, $template_directory.'/wpbb-template.php');
-            if (!$move_template_file) {
-                $move_template_file_failed = sprintf(__('Failed to move required wp-bb template file %s to theme directory %s. Please make sure both the file and directory exist or move the wp-bb template file to your current theme directory manually'), $template_file_path, $template_directory);
-                error_log($move_template_file_failed);
+if (!function_exists('wpbb_admin_pages'))
+{
+    function wpbb_admin_pages()
+    {
+        $create_category = __('Create Category', 'wp-bb');
+        $create_forum = __('Create Forum', 'wp-bb');
+        $create_subforum = __('Create Subforum', 'wp-bb');
+        $create_topic = __('Create Topic', 'wp-bb');
+        $role_permissions = __('Role Permissions', 'wp-bb');
+        $create_tools = __('Tools', 'wp-bb');
+        $faq_support = __('FAQ & Support', 'wp-bb');
+        $settings = __('WPBB Settings', 'wp-bb');
+
+        // Main WPBB page
+        add_menu_page('WPBB Overview', 'WPBB', 'manage_options', 'wpbb_admin', 'wpbb_admin_display', '', 27.7);
+    
+        // Create/Edit Category
+        add_submenu_page('wpbb_admin', 'WPBB Categories', $create_category, 'manage_options', 'wpbb_admin_categories', 'wpbb_admin_categories');
+    
+        // Create/Edit Forum
+        add_submenu_page('wpbb_admin', 'WPBB Forums', $create_forum, 'manage_options', 'wpbb_admin_forums', 'wpbb_admin_forums');
+    
+        // Create/Edit Subforum
+        add_submenu_page('wpbb_admin', 'WPBB Subforums', $create_subforum, 'manage_options', 'wpbb_admin_subforums', 'wpbb_admin_subforums');
+    
+        // Create/Edit Topics
+        add_submenu_page('wpbb_admin', 'WPBB Topics', $create_topic, 'manage_options', 'wpbb_admin_topics', 'wpbb_admin_topics');
+        
+        // Role permissions
+        add_submenu_page('wpbb_admin', 'Role Permissions', $role_permissions, 'manage_options', 'wpbb_admin_role_permissions', 'wpbb_admin_role_permissions');
+    
+        // Create Tools page
+        add_submenu_page('wpbb_admin', 'WPBB Tools', $create_tools, 'manage_options', 'wpbb_admin_tools', 'wpbb_admin_tools');
+    
+        // FAQ / First Installation Page
+        add_submenu_page('wpbb_admin', 'FAQ / Support', $faq_support, 'manage_options', 'wpbb_admin_help', 'wpbb_admin_help');
+        
+        // Shortcut to WPBB settings - some people don't know they exist
+        add_submenu_page('wpbb_admin', 'WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
+    
+        // WPBB Settings
+        add_options_page('WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
+    }
+}
+
+
+if (!function_exists('wpbb_create_template_file'))
+{
+    function wpbb_create_template_file()
+    {
+        // Get current theme directory
+        $template_directory = get_template_directory();
+        // Check if required template file doesn't exist and if true create it
+        if (!file_exists($template_directory.'/wpbb-template.php'))
+        {
+            // Check directory is writable
+            if (is_writable($template_directory))
+            { 
+                // Copys wp-bb template file to your current theme
+                $template_file_path = WPBB_DIR.'/wpbb-template.php';
+                $move_template_file = copy($template_file_path, $template_directory.'/wpbb-template.php');
+                if (!$move_template_file)
+                {
+                    $move_template_file_failed = sprintf(__('Failed to move required wp-bb template file %s to theme directory %s. Please make sure both the file and directory exist or move the wp-bb template file to your current theme directory manually'), $template_file_path, $template_directory);
+                    error_log($move_template_file_failed);
+                }
             }
-        } else { // Is not writable and user should change permissions accordingly
-            $template_write_failed = sprintf(__('%s is not writable. Could not create required WPBB template file forum.php. Please change the folders permissions and visit your Wordpress site again or copy the file forum.php from your wp-bb plugin folder to your template folders directory manually.'), $template_directory);
-            error_log($template_write_failed);
-        }
-    }
-}
-
-function wpbb_create_page() {
-    // Check the page doesn't already exist (e.g. when reactivating)
-    global $wpdb;
-    $post_meta = $wpdb->prefix.'postmeta';
-    $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '_wp_page_template' AND meta_value = 'wpbb-template.php';");
-    if ($post_id == NULL) {
-        $wpbb_page_title = __('Forums', 'wp-bb');
-        $link = site_url().'/'.strtolower($wpbb_page_title);
-        $page = array(
-            'post_status' => 'publish',
-            'post_title' => $wpbb_page_title,
-            'comment_status' => 'closed',
-            'post_type' => 'page'
-        );
-        global $forum_page;
-        $forum_page = wp_insert_post($page, false);
-        add_post_meta($forum_page, '_wp_page_template', 'wpbb-template.php', true);
-    }
-    // This function checks if the template file exists before doing anything
-    $template = wpbb_create_template_file();
-}
-
-function wpbb_register_styles() {
-    $wpbb_theme_options = get_option('wpbb_theme_options');
-    if ($wpbb_theme_options['theme'] == 'light') {
-        wp_register_style('wpbb-light-style', plugins_url('wp-bulletin-board/css/wpbb-light-style.css'));
-        wp_enqueue_style('wpbb-light-style');
-    } else {
-        wp_register_style('wpbb-dark-style', plugins_url('wp-bulletin-board/css/wpbb-dark-style.css'));
-        wp_enqueue_style('wpbb-dark-style');
+            else
+            { 
+                // Is not writable and user should change permissions accordingly
+                $template_write_failed = sprintf(__('%s is not writable. Could not create required WPBB template file forum.php. Please change the folders permissions and visit your Wordpress site again or copy the file forum.php from your wp-bb plugin folder to your template folders directory manually.'), $template_directory);
+                error_log($template_write_failed);
+            }
+        }
+    }
+}
+
+if (!function_exists('wpbb_create_page'))
+{
+    function wpbb_create_page()
+    {
+        // Check the page doesn't already exist (e.g. when reactivating)
+        global $wpdb;
+        $post_meta = $wpdb->prefix.'postmeta';
+        $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '_wp_page_template' AND meta_value = 'wpbb-template.php';");
+        if ($post_id == NULL)
+        {
+            $wpbb_page_title = __('Forums', 'wp-bb');
+            $link = site_url().'/'.strtolower($wpbb_page_title);
+            $page = array(
+                'post_status' => 'publish',
+                'post_title' => $wpbb_page_title,
+                'comment_status' => 'closed',
+                'post_type' => 'page'
+            );
+            global $forum_page;
+            $forum_page = wp_insert_post($page, false);
+            add_post_meta($forum_page, '_wp_page_template', 'wpbb-template.php', true);
+        }
+        // This function checks if the template file exists before doing anything
+        $template = wpbb_create_template_file();
+    }
+}
+
+/*
+    Wordpress post metaboxes
+*/
+
+if (!function_exists('wpbb_post_saved'))
+{
+    function wpbb_post_saved($_post_id)
+    {
+        if (wp_is_post_revision($_post_id))
+        {
+            return;
+        }
+        static $first = true;
+        if (!$first) return;
+        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
+        {
+            return;
+        }
+        $post_metabox_nonce = isset($_POST['wpbb-post-metabox-nonce']);
+        if (!wp_verify_nonce($post_metabox_nonce, plugin_basename(__FILE__)))
+        {
+            return;
+        }
+        $_post_type = isset($_POST['post_type']);
+        if ('post' == $_post_type)
+        {
+            if (!current_user_can('edit_page', $_post_id))
+            {
+                return;
+            }
+        }
+        $post_id = absint($_post_id);
+        $post_data = get_post($post_id, ARRAY_A);
+        $post_to_forum_id = NULL;
+        if (isset($_POST['wpbb-post-to-forum']))
+        {
+            $post_to_forum_id = absint($_POST['wpbb-post-to-forum']);
+        }
+        if ($post_to_forum_id == NULL)
+        {
+            error_log(__('When copying the post to a WPBB forum, the wpbb-post-to-forum was NULL - a forum ID wasn\'t provided'));
+        }
+        $is_forum = NULL;
+        $is_subforum = NULL;
+        global $wpdb;
+        // Check to see if this forum is a forum or a subforum
+        $forum_or_subforum = $wpdb->get_results("SELECT `forum`, `subforum` FROM ".CATEGORY_TABLE." WHERE id = $post_to_forum_id;");
+        if ($forum_or_subforum)
+        {
+            foreach ($forum_or_subforum as $forum)
+            {
+                if ($forum->forum > 0 && $forum->subforum == 0)
+                {
+                    // Forum
+                    $is_forum = true;
+                    $is_subforum = false;
+                }
+                else if ($forum->subforum > 0 && $forum->forum == 0)
+                {
+                    // Subforum
+                    $is_subforum = true;
+                    $is_forum = false;
+                }
+            }
+        }
+        if ($post_data)
+        {
+            $forum_id = ($is_forum) ? $post_to_forum_id : 0;
+            $subforum_id = ($is_subforum) ? $post_to_forum_id : 0;
+            $data = array(
+                'name' => $post_data['post_title'],
+                'author' => $post_data['post_author'],
+                'content' => $post_data['post_content'],
+                'forum' => $forum_id,
+                'subforum' => $subforum_id,
+                'status' => '',
+                'created' => $post_data['post_date'],
+                'last_reply' => $post_data['post_date']
+            );
+            $copy_post_to_forum = $wpdb->insert(TOPICS_TABLE, $data);
+            if ($copy_post_to_forum === false)
+            {
+                error_log(__('Failed to copy the wordpress post to the wpbb forum', 'wp-bb'));
+            }
+            else
+            {
+                // Update authors post count
+                wpbb_admin_update_user_meta($post_data['post_author'], 'increase');
+                $first = false;
+            }
+        }
+    }
+}
+
+if (!function_exists('wpbb_display_metaboxes'))
+{
+    function wpbb_display_metaboxes()
+    {
+        global $wpdb;
+        wp_nonce_field(plugin_basename(__FILE__), 'wpbb-post-metabox-nonce');
+        ?>
+        <div id="minor-publishing-actions">
+            <p class="description">Send a copy of this post to one of your WPBB forums or subforums or check "None" or disable this in your WPBB Settings</p>
+            <select name="wpbb-post-to-forum">
+                <!-- Default -->
+                <option value="0">None</option>
+                <?php
+                // All forums and subforums
+                $forums = $wpdb->get_results("SELECT `id`, `name` FROM ".CATEGORY_TABLE." WHERE forum > 0 || subforum > 0;");
+                if ($forums)
+                {
+                    foreach ($forums as $forum)
+                    {
+                        ?>
+                        <option value="<?php echo $forum->id; ?>"><?php echo $forum->name;?></option>
+                        <?php
+                    }
+                }
+                ?>
+            </select>
+        </div>
+        <?php
+    }
+}
+
+if (!function_exists('wpbb_create_metaboxes'))
+{
+    function wpbb_create_metaboxes()
+    {
+        add_meta_box('wpbb-post-to-forum-meta-box', __('Post to WPBB Forum', 'wp-bb'), 'wpbb_display_metaboxes', 'post', 'side', 'high', NULL);
+    }
+}
+
+/*
+    Register and loads the style and javascript files depending on settings
+*/
+
+if (!function_exists('wpbb_register_styles'))
+{
+    function wpbb_register_styles()
+    {
+        $wpbb_theme_options = get_option('wpbb_theme_options');
+        if ($wpbb_theme_options['theme'] == 'light')
+        {
+            wp_register_style('wpbb-light-style', plugins_url('wp-bulletin-board/css/wpbb-light-style.css'));
+            wp_enqueue_style('wpbb-light-style');
+        }
+        else
+        {
+            wp_register_style('wpbb-dark-style', plugins_url('wp-bulletin-board/css/wpbb-dark-style.css'));
+            wp_enqueue_style('wpbb-dark-style');
+        }
+        wp_enqueue_script('jquery');
+        wp_register_script('wpbb-search', plugins_url('wp-bulletin-board/js/wpbb-search.js'), 'jquery');
+        wp_enqueue_script('wpbb-search');
     }
 }
@@ -432 +685 @@
 */
 
-function wpbb_admin_display() {
-    require_once('php/admin/wpbb-admin-main.php');
-}
+if (!function_exists('wpbb_admin_display'))
+{
+    function wpbb_admin_display()
+    {
+        require_once('php/admin/admin-main.php');
+    }
+}
+
 
 
@@ -441 +699 @@
 */
 
-function wpbb_admin_categories() {
-    require_once('php/admin/wpbb-admin-categories.php');
+if (!function_exists('wpbb_admin_categories'))
+{
+    function wpbb_admin_categories()
+    {
+        require_once('php/admin/admin-categories.php');
+    }
 }
 
@@ -449 +711 @@
 */
 
-function wpbb_admin_forums() {
-    require_once('php/admin/wpbb-admin-forums.php');
+if (!function_exists('wpbb_admin_forums'))
+{
+    function wpbb_admin_forums()
+    {
+        require_once('php/admin/admin-forums.php');
+    }
 }
 
@@ -457 +723 @@
 */
 
-function wpbb_admin_subforums() {
-    require_once('php/admin/wpbb-admin-subforums.php');
+if (!function_exists('wpbb_admin_subforums'))
+{
+    function wpbb_admin_subforums()
+    {
+        require_once('php/admin/admin-subforums.php');
+    }
 }
 
@@ -465 +735 @@
 */
 
-function wpbb_admin_topics() {
-    require_once('php/admin/wpbb-admin-topics.php');
+if (!function_exists('wpbb_admin_topics'))
+{
+    function wpbb_admin_topics()
+    {
+        require_once('php/admin/admin-topics.php');
+    }
+}
+
+/* 
+    Role Permissions
+*/
+
+if (!function_exists('wpbb_admin_role_permissions'))
+{
+    function wpbb_admin_role_permissions()
+    {
+        require_once('php/admin/admin-role-permissions.php');
+    }
 }
 
@@ -473 +759 @@
 */
 
-function wpbb_admin_tools() {
-    require_once('php/admin/wpbb-admin-tools.php');
+if (!function_exists('wpbb_admin_tools'))
+{
+    function wpbb_admin_tools()
+    {
+        require_once('php/admin/admin-tools.php');
+    }
 }
 
@@ -481 +771 @@
 */
 
-function wpbb_admin_help() {
-    require_once('php/admin/wpbb-admin-faq-support.php');
-}
-
+if (!function_exists('wpbb_admin_help'))
+{
+    function wpbb_admin_help()
+    {
+        require_once('php/admin/admin-faq-support.php');
+    }
+}
 
 /*
@@ -490 +783 @@
 */
 
-function wpbb_display_settings() {
-    require_once('php/admin/wpbb-admin-settings.php');
+if (!function_exists('wpbb_display_settings'))
+{
+    function wpbb_display_settings()
+    {
+        require_once('php/admin/admin-settings.php');
+    }
 }
 

wp-bulletin-board/trunk/css/wpbb-light-style.css

@@ -1 +1 @@
 /* 
     WPBB light style
-    
-    To be used on a light background, preferably white
-    
-    This only affects the front end as the back end implements wordpress styling.
 */
 
@@ -30 +26 @@
     font-weight:bold;
     padding-bottom:10px;
+}
+
+/* Change the forum title position and color of the slash (/) character here */
+h2.wpbb-forum-title {
+    text-align:center;
+    padding-bottom:10px;
+}
+
+/* Change the color of the forum title link here, boldness, etc */
+h2.wpbb-forum-title a {
+    font-weight:bold;
+    color:purple;
 }
 
@@ -184 +192 @@
     min-width: 500px;
     white-space: pre-line;
+    text-align:left;
 }
 

wp-bulletin-board/trunk/php/facebook/wpbb-facebook.php

@@ -9 +9 @@
 $user_id = get_current_user_id();
 
-if ($user_id !== 0) { // User is logged in
-
+if ($user_id !== 0)
+{
+    // User is logged in
     $user_access_token = get_user_meta($user_id, 'wpbb_facebook_access_token', true);
-
-    if ($user_access_token != "" && is_user_logged_in()) { // User is logged into Facebook
-    
+    if ($user_access_token != "" && is_user_logged_in())
+    {
+        // User is logged into Facebook
         $logged_into_facebook = true;
-
-        if (count($_GET) == 0) {
+        if (count($_GET) == 0)
+        {
         ?>
         <div class="wpbb-centered">
@@ -25 +26 @@
         <?php
         }
-    
-    } 
-    
-    
-} else { // User is not logged in
-    
-    // Registering for a Wordpress account through Facebook
+    }
+} 
+else
+{ 
+    /* 
+        User is not logged in
+        Registering for a Wordpress account through Facebook 
+    */
     if ((isset($_GET['register'])) && (isset($_GET['method'])) && (count($_GET) == 2)) {
     
@@ -130 +132 @@
                         <br />
                         <div class="wpbb-centered">
-                            <?php printf(__('Thankyou for logging in to Facebook, %s!'), $facebook_user['name']); ?>
+                            <?php printf(__('Thank you for logging in to Facebook, %s!'), $facebook_user['name']); ?>
                             <br /><br />
                             <?php _e('Please now enter the password for your Wordpress account you registered using Facebook.', 'wp-bb'); ?><br /><br /><?php
@@ -238 +240 @@
         <div class="wpbb-message-success">
             <?php
-            _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+            _e('Thank you for registering. Please login with your Facebook username and password you just created', 'wp-bb');
             ?>
         </div>

wp-bulletin-board/trunk/php/twitter/wpbb-twitter.php

@@ -5 +5 @@
 */
 
-if (count($_GET) == 0) {
+if (count($_GET) == 0)
+{
     ?>
     <div class="wpbb-centered">

wp-bulletin-board/trunk/php/wpbb-forum.php

@@ -4 +4 @@
     Checks if the plugin is deactivated
 */
-
 
 // Since we're not in the admin area we must require the plugin.php file
@@ -18 +17 @@
     <div style="text-align:center;font-weight:bold;color:red;">
         <?php
-            _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB', 'wp-bb');
+            _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB or delete this page', 'wp-bb');
             wpbb_exit();
         ?>
@@ -35 +34 @@
 
 // Sets the default timezone used by all date/time functions in a script depending on server configuration option
-if (ini_get('date.timezone.')) {
+if (ini_get('date.timezone.'))
+{
     $timezone = ini_get('date.timezone');
     date_default_timezone_set($timezone);
@@ -48 +48 @@
 define('POST_TABLE', $wpdb->prefix.'wpbb_posts');
 define('MESSAGES_TABLE', $wpdb->prefix.'wpbb_messages');
+define('UN_READ_TABLE', $wpdb->prefix.'wpbb_topics_unread');
 
 // The WP-BB plugin url on wordpress - only used if show footer option is set to yes
@@ -53 +54 @@
 
 
-function wpbb_exit() {
+function wpbb_exit()
+{
     get_header();
     get_footer();
@@ -63 +65 @@
     && (!is_user_logged_in())
     && (!isset($_GET['method']))
-    && (!isset($_GET['state']))) {
-    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+    && (!isset($_GET['state'])))
+    {
+    if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+    {
         require_once('facebook/wpbb-facebook.php');
     }
-    require_once('wpbb-functions.php');
+    require_once('functions.php');
     ?>
     <div class="wpbb-centered-bold">
@@ -77 +81 @@
 }
 
-if ($wpbb_options['maintenance_mode'] == 'on') {
-    if (current_user_can('manage_options')) {
+if ($wpbb_options['maintenance_mode'] == 'on')
+{
+    if (current_user_can('manage_options'))
+    {
         ?>
         <div class="wpbb-message-warning">
@@ -84 +90 @@
         </div>
         <?php
-    } else {
+    }
+    else
+    {
         ?>
         <div class="wpbb-message-warning">
@@ -90 +98 @@
         </div>
         <?php
-        if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+        if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+        {
             require_once('facebook/wpbb-facebook.php');
         }
-        require_once('wpbb-functions.php');
+        require_once('functions.php');
         wpbb_footer();
         wpbb_exit();
@@ -103 +112 @@
 */
 
-require_once('wpbb-functions.php');
-
-/* 
+require_once('functions.php');
+
+/*
     Checks a page supplied exists
 */
@@ -115 +124 @@
 */
 
-if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+if ($wpbb_facebook_options['allow_facebook'] == 'yes')
+{
     require_once('facebook/wpbb-facebook.php');
 }
@@ -126 +136 @@
 $wpbb_twitter_options = get_option('wpbb_twitter_options');
 
-if ($wpbb_twitter_options['allow_twitter'] == 'yes') {
+if ($wpbb_twitter_options['allow_twitter'] == 'yes')
+{
     require_once('twitter/wpbb-twitter.php');
 }
@@ -138 +149 @@
 */
 
+
 if (empty($permalink_options))
 { 
-    if (count($_GET) == 1) {
-        require_once('wpbb-index.php');
-    }
-
+    if (count($_GET) == 1)
+    {
+        require_once('forum-index.php');
+    }
 
     /*
@@ -152 +164 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-forum.php');
+        require_once('view-forum.php');
     }
     
@@ -165 +177 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-forum-topic.php');
-    }
-
+        require_once('view-forum-topic.php');
+    }
 
     /*
@@ -177 +188 @@
         && (isset($_GET['forum']) && isset($_GET['subforum']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-create-topic.php');
+        require_once('create-topic.php');
     }
 
@@ -184 +195 @@
         && (isset($_GET['forum']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-create-topic.php');
-    }
-
+        require_once('create-topic.php');
+    }
 
     /*
@@ -197 +207 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-subforum.php');
+        require_once('view-subforum.php');
     }
 
@@ -211 +221 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 5)) {
-        require_once('wpbb-view-subforum-topic.php');
+        require_once('view-subforum-topic.php');
     }
 
@@ -221 +231 @@
         && (isset($_GET['page_id']))
         && (count($_GET) == 2)) {
-        require_once('wpbb-view-profile.php');
+        require_once('view-profile.php');
     }
 
@@ -232 +242 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-all-messages.php');
+        require_once('all-messages.php');
     }
     
@@ -243 +253 @@
         && (isset($_GET['page_id']))
         && (count($_GET) > 1 && count($_GET) <= 3)) {
-        require_once('wpbb-delete-message.php');
+        require_once('delete-message.php');
     }
 
@@ -255 +265 @@
         && ((isset($_GET['view'])) && ($_GET['view']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-message.php');
+        require_once('view-message.php');
     }
 
@@ -265 +275 @@
         && (isset($_GET['page_id']))
         && (count($_GET) == 2)) {
-        require_once('wpbb-message-user.php');
+        require_once('message-user.php');
     }
 
@@ -281 +291 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-edit-topic.php');
+        require_once('edit-topic.php');
     }
 
@@ -297 +307 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-lock-topic.php');
+        require_once('lock-topic.php');
     }
 
@@ -313 +323 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'edit')))) {
-        require_once('wpbb-sticky-topic.php');
+        require_once('sticky-topic.php');
     }
 
@@ -329 +339 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-delete-topic.php');
+        require_once('delete-topic.php');
     }
 
@@ -346 +356 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-markread-topic.php');
+        require_once('markread-topic.php');
     }
 
@@ -363 +373 @@
         && ($_GET['action'] != 'edit')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-reply-topic.php');
+        require_once('reply-topic.php');
     }
 
@@ -375 +385 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-unread-topics.php');
+        require_once('unread-topics.php');
     }
 
@@ -387 +397 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-unanswered-topics.php');
+        require_once('unanswered-topics.php');
     }
     
     // Not default or custom structure
 
-} else {
-
-    if (count($_GET) == 0) {
-        require_once('wpbb-index.php');
+} 
+else
+{
+    if (count($_GET) == 0)
+    {
+        require_once('forum-index.php');
     }
 
@@ -405 +417 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-view-forum.php');
-    }
-
-
-
+        require_once('view-forum.php');
+    }
+    
     /*
         Viewing A Forum Topic
@@ -418 +428 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-forum-topic.php');
+        require_once('view-forum-topic.php');
     }
 
@@ -429 +439 @@
         && (isset($_GET['forum']) && isset($_GET['subforum']) || isset($_GET['forum']) && !isset($_GET['subforum']))
         && (count($_GET) == 2 || count($_GET) == 3)) {
-            require_once('wpbb-create-topic.php');
+            require_once('create-topic.php');
     }
 
@@ -440 +450 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 3)) {
-        require_once('wpbb-view-subforum.php');
+        require_once('view-subforum.php');
     }
 
@@ -453 +463 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 4)) {
-        require_once('wpbb-view-subforum-topic.php');
+        require_once('view-subforum-topic.php');
     }
 
@@ -462 +472 @@
     if ((isset($_GET['profile']))
         && (count($_GET) == 1)) {
-        require_once('wpbb-view-profile.php');
+        require_once('view-profile.php');
     }
 
@@ -474 +484 @@
         && (isset($_GET['current_page']))
         && (count($_GET) == 2 || count($_GET) == 3)) {
-        require_once('wpbb-all-messages.php');
+        require_once('all-messages.php');
     }
     
@@ -485 +495 @@
         && (isset($_GET['delete_msg']))
         && (count($_GET) > 1 && count($_GET) <= 2)) {
-        require_once('wpbb-delete-message.php');
+        require_once('delete-message.php');
     }
     /*
@@ -495 +505 @@
         && ((isset($_GET['view']))
         && (count($_GET) == 2))) {
-        require_once('wpbb-view-message.php');
+        require_once('view-message.php');
     }
 
@@ -504 +514 @@
     if ((isset($_GET['message']))
         && (count($_GET) == 1)) {
-        require_once('wpbb-message-user.php');
+        require_once('message-user.php');
     }
 
@@ -519 +529 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-edit-topic.php');
+        require_once('edit-topic.php');
     }
 
@@ -534 +544 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-lock-topic.php');
+        require_once('lock-topic.php');
     }
 
@@ -549 +559 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'edit')))) {
-        require_once('wpbb-sticky-topic.php');
+        require_once('sticky-topic.php');
     }
 
@@ -564 +574 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-delete-topic.php');
+        require_once('delete-topic.php');
     }
 
@@ -574 +584 @@
         && (isset($_GET['topic']))
         && ((isset($_GET['action']) 
-        && ($_GET['action'] == 'markread') 
+        && ($_GET['action'] == 'markread')
         && ($_GET['action'] != 'delete')
         && ($_GET['action'] != 'lock') 
@@ -580 +590 @@
         && ($_GET['action'] != 'reply')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-markread-topic.php');
+        require_once('markread-topic.php');
     }
 
@@ -596 +606 @@
         && ($_GET['action'] != 'edit')
         && ($_GET['action'] != 'sticky')))) {
-        require_once('wpbb-reply-topic.php');
+        require_once('reply-topic.php');
     }
 
@@ -607 +617 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-unread-topics.php');
+        require_once('unread-topics.php');
     }
 
@@ -618 +628 @@
         && (isset($_GET['current_page'])) 
         && (count($_GET) == 2)) {
-        require_once('wpbb-unanswered-topics.php');
+        require_once('unanswered-topics.php');
     }
 }

wp-bulletin-board/trunk/readme.txt

@@ -3 +3 @@
 Donate link: http://codebycarter.x10.mx/wp/donate/
 Tags: forum, bulletin board, twitter, facebook, discussion, discussion board, messaging, private message, topic, post, pagination, profile, subforum, wpbb
-Requires at least: 3.3
-Tested up to: 3.4.2
-Stable tag: 1.0.4
+Requires at least: 3.0
+Tested up to: 3.5
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -18 +18 @@
 
 = Features =
-* - Ease of Integration - WPBB creates a template file for your current template when you install or change your theme so you don't have to do anything. Everything can be managed from your admin area.
-* - Translatable - WPBB can easily be translated into your preferred language!
-* - Facebook registration - Allow your users to register on your Wordpress site via Facebook. This automatically creates a WP account for your Facebook users which they can then login to after authenticating.
-* - Twitter - Enter your twitter account in your settings and your users will be able to follow your website / personal account with the click of a button.
-* - Private Messaging System - Allow users to send messages to each other.
-* - Member Profiles - All your WP users are automatically  apart of your forum whenever you create it and have a "forum profile" which can be viewed on the forum which shows the users avatar, username, role, posts, website and signature. Signatures are apart of WPBB and allow your users to enter a signature which can be text or images and is displayed below their profile and posts.
-* - Categories, Forums, Sub forums - Organise your forums into categories and your sub forums into forums. There is no limit to the amount of forums its parent can have, and each are ordered by its appearance in its parent.
-* - Permissions system - Currently supports the ability to allow or disallow any role (even custom roles!) any specific permission (edit, view, read, post, reply, lock, delete, sticky). WPBB grabs all known roles from your WP site which you can set permissions for manually or copy existing permissions from a previous forum.
-* - Topics - If you have the permissions to do so you can edit, lock, delete, sticky, view, read, post or reply with a topic.
-* - Posts - You can edit and delete any post and the posts topic affects the posts status. You can create posts in two ways, creating a topic reply with presents the WP editor for improved formatting or you can use the quick reply feature (if it is enabled in your settings).
-* - Pagination System - Supports a simple pagination system which organises your topics and posts - you can set the max topics/posts per page in your wpbb settings.
-* - Unread Topics - WPBB collects a list of topics which have been posted when you were offline and displays them for you. You can mark any of them as read once you've read them.
-* - Unanswered Topics - Similar to the above feature, unanswered topics are ones which haven't yet received any replies.
-* - Admin area - The WPBB settings integrate with your existing WP admin area where you can easily manage your forums with ease. The WPBB overview allows you to change the order of a category, forum or sub forum, edit it and delete it with a single click. You can also create new categories, forums, sub forums and topics via the admin area.
-* - Settings - WPBB is jam packed with settings that you can use to customise the forum any way you want to.
+* Compatibility - Fully compatible with 3.5, 3.4, 3.3, 3.2, 3.1 and 3.0
+* Ease of Integration - WPBB works with any theme, you can change your theme anytime and WPBB will automatically update itself.
+* Translatable - WPBB can easily be translated into your preferred language!
+* Facebook registration - Allow your users to register on your Wordpress site via Facebook. This automatically creates a WP account for your Facebook users which they can then login to after authenticating.
+* Twitter - Enter your twitter account in your settings and your users will be able to follow your website / personal account with the click of a button.
+* Private Messaging System - Allow users to send messages to each other.
+* Member Profiles - All your WP users are automatically  apart of your forum whenever you create it and have a "forum profile" which can be viewed on the forum which shows the users avatar, username, role, posts, website and signature. Signatures are apart of WPBB and allow your users to enter a signature which can be text or images and is displayed below their profile and posts.
+* Categories, Forums, Sub forums - Organise your forums into categories and your sub forums into forums. There is no limit to the amount of forums its parent can have, and each are ordered by its appearance in its parent.
+* Permissions system - Currently supports the ability to allow or disallow any role (even custom roles!) any specific permission (edit, view, read, post, reply, lock, delete, sticky). WPBB grabs all known roles from your WP site which you can set permissions for manually or copy existing permissions from a previous forum.
+* Role Permissions - New in 1.1. Allows you to choose whether a role can only edit, lock, delete and sticky their own topics or everyones.
+* Topics - If you have the permissions to do so you can edit, lock, delete, sticky, view, read, post or reply with a topic.
+* Posts - You can edit and delete any post and the posts topic affects the posts status. You can create posts in two ways, creating a topic reply with presents the WP editor for improved formatting or you can use the quick reply feature (if it is enabled in your settings).
+* Pagination System - Supports a simple pagination system which organises your topics and posts - you can set the max topics/posts per page in your wpbb settings.
+* Unread Topics - WPBB collects a list of topics which have been posted when you were offline and displays them for you. You can mark any of them as read once you've read them.
+* Unanswered Topics - Similar to the above feature, unanswered topics are ones which haven't yet received any replies.
+* Admin area - The WPBB settings integrate with your existing WP admin area where you can easily manage your forums with ease. The WPBB overview allows you to change the order of a category, forum or sub forum, edit it and delete it with a single click. You can also create new categories, forums, sub forums and topics via the admin area.
+* Settings - WPBB is jam packed with settings that you can use to customise the forum any way you want to.
+* Tools - Tools help make your life easier. Tools such as updating your roles whenever you add, change or remove them and a tool to recreate the forum page if you ever accidentally delete it.
 
-And many more...
+And much much more!
 
 == Installation ==
@@ -60 +63 @@
 Firstly always download the plugin again as the plugin is constantly updated. It is likely the problem you're having has been fixed already. If that doesn't work, create a topic here: http://wordpress.org/support/plugin/wp-bulletin-board
 
+= How to Setup Facebook Integration =
+
+1. https://developers.facebook.com/apps (register or login)
+2. "Create New App"
+3. Enter App Name, can be anything you want, don't worry about app namespace or web hosting. Click continue.
+4. Facebook should've created the app for you and you'll see at the top the name of your app and the default avatar, next to that there is your App ID and App Secret Key. Enter those into your WPBB facebook settings.
+5. You may want to enter a contact email and change any other settings to your liking but leave sandbox mode disabled and don't use the "Hosting URL"
+6. Click "Website with Facebook Login" under "Select how your app integrates with Facebook" then enter the URL to your wpbb forum e.g. http://mysite.com/wordpress/forum
+7. Save changes
+
+= When I edit and save my forum or subforum, there is an error =
+
+It is likely that you are updating a forum with roles that no longer exist. Go to your admin dashboard -> WPBB -> Tools -> Refresh Roles. Use this tool whenever you add, change or remove roles. Roles are like the ranks or capabilities that users have, e.g. subscriber, author, administrator, etc.
+
 == Screenshots ==
 
@@ -71 +88 @@
 
 == Changelog ==
+
+= 1.1.0 =
+* Role permissions added which allow you to set whether a role can edit, lock, delete or sticky only their own topics or posts or everyones.
+* Now compatible with wordpress versions 3.0, 3.1, 3.2, 3.3 and 3.5
+* Fixes error in topic post editor
+* (un)read topics are now used per user instead of globally as it should be
+* Removed unneccessary forum prefix setting as you can include 'forum' in your own title
+* Fixed post count not changing when deleting topics and/or posts and when editing topics and posts.
+* Fixes a number of bugs translators encountered when trying to translate wpbb
+* Clicking the search box now clears the textbox, more javascript will be added in the future for those that use it
+* Added useful descriptions next to all the settings in the wpbb settings.
+* New tool added which allows you to recreate your forums page if it was accidentally deleted or didn't create for some reason
+* Last post/reply will now take you to that topic or post
+* You can no longer create empty topics, posts or messages or give them empty titles
+* You can now go straight to your newly created topic or post when creating a topic or reply.
+* Updated FAQ
+* Minor bug fixes and typos fixed.
 
 = 1.0.4 =

wp-bulletin-board/trunk/wp-bb.php

@@ -4 +4 @@
     Plugin URI: http://wordpress.org/extend/plugins/wp-bulletin-board/
     Description: An easy to use Bulletin board for Wordpress with Facebook and Twitter integration.
-    Version: 1.0.4
+    Version: 1.1.0
     Author: Jay Carter
     Author URI: http://codebycarter.com
@@ -29 +29 @@
 
 // Sets the default timezone used by all date/time functions in a script depending on server configuration option
-if (ini_get('date.timezone.')) {
+if (ini_get('date.timezone.'))
+{
     $timezone = ini_get('date.timezone');
     date_default_timezone_set($timezone);
@@ -35 +36 @@
 
 // Define wpbb plugin directory
-define('WPBB_DIR', plugin_dir_path(__FILE__));
+if (!defined('WPBB_DIR'))
+{
+    define('WPBB_DIR', plugin_dir_path(__FILE__));
+}
 // Contains categories, forums and subforums
-define('CATEGORY_TABLE', $wpdb->prefix.'wpbb_categories');
+if (!defined('CATEGORY_TABLE'))
+{
+    define('CATEGORY_TABLE', $wpdb->prefix.'wpbb_categories');
+}
 // Contains all topics whether in a category, forum or subforum
-define('TOPICS_TABLE', $wpdb->prefix.'wpbb_topics');
+if (!defined('TOPICS_TABLE'))
+{
+    define('TOPICS_TABLE', $wpdb->prefix.'wpbb_topics');
+}
 // Contains all posts inside a specific topic
-define('POSTS_TABLE', $wpdb->prefix.'wpbb_posts');
+if (!defined('POSTS_TABLE'))
+{
+    define('POSTS_TABLE', $wpdb->prefix.'wpbb_posts');
+}
 // Contains all user messages
-define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
+if (!defined('MESSAGE_TABLE'))
+{
+    define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
+}
+// Contains all topics for each user and whether they are read or not
+if (!defined('UNREAD_TABLE'))
+{
+    define('UNREAD_TABLE', $wpdb->prefix.'wpbb_topics_unread');
+}
 // Define current version
-define('WPBB_VERSION', 'v1.0.4');
+if (!defined('WPBB_VERSION'))
+{
+    define('WPBB_VERSION', 'v1.1.0');
+}
 // Define plugin url (wp plugin page)
-define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
+if (!defined('WPBB_PLUGIN_URL'))
+{
+    define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
+}
 
 /*
@@ -53 +80 @@
 */
 
-function wpbb_load_language() {
-    load_plugin_textdomain('wp-bb', false, dirname(plugin_basename(__FILE__)).'/languages/');
-}
 add_action('plugins_loaded', 'wpbb_load_language');
+
+if (!function_exists('wpbb_load_language'))
+{
+    function wpbb_load_language()
+    {
+        load_plugin_textdomain('wp-bb', false, dirname(plugin_basename(__FILE__)).'/languages/');
+    }
+}
 
 /*
@@ -75 +107 @@
 add_action('wp_enqueue_scripts', 'wpbb_register_styles');
 
+$options = get_option('wpbb_options');
+if ($options['post_to_forum'] == 'yes')
+{
+    add_action('add_meta_boxes', 'wpbb_create_metaboxes'); // Metaboxes
+    add_action('save_post', 'wpbb_post_saved'); // Wordpress post saved
+}
+
 /*
     All WPBB Admin (Non Page or DB related) Functions
@@ -81 +120 @@
 */
 
-require_once('php/admin/wpbb-admin-functions.php');
+require_once('php/admin/admin-functions.php');
 
 /*
@@ -87 +126 @@
 */
 
-function wpbb_activate() {
-    // Create all neccessary database tables
-    wpbb_create_db_table();
-    // Create options in DB for our settings
-    wpbb_create_options();
-    // Create the user meta for all users currently registered
-    wpbb_setup_user_meta();
-    // Creates the Forum page
-    wpbb_create_page();
+if (!function_exists('wpbb_activate'))
+{
+    function wpbb_activate()
+    {
+        // Create all neccessary database tables
+        wpbb_create_db_table();
+        // Create options in DB for our settings
+        wpbb_create_options();
+        // Create the user meta for all users currently registered
+        wpbb_setup_user_meta();
+        // Creates the Forum page
+        wpbb_create_page();
+    }
 }
 
@@ -102 +145 @@
 */
 
-function wpbb_uninstall() {
-    global $wpdb;
-    // Delete main options from database
-    delete_option('wpbb_options');
-    // Delete theme options
-    delete_option('wpbb_theme_options');
-    // Delete facebook options
-    delete_option('wpbb_facebook_options');
-    // Delete twitter options
-    delete_option('wpbb_twitter_options');
-    // Delete guest options
-    delete_option('wpbb_guest_options');
-    // Delete the user meta
-    wpbb_delete_user_meta();
-    // Delete post meta (this function is in wpbb-functions.php as the page is created in wpbb-forum.php)
-    wpbb_delete_post_meta();
-    // Delete database tables
-    $wpdb->query("DROP TABLE ".CATEGORY_TABLE.", ".TOPICS_TABLE.", ".POSTS_TABLE.", ".MESSAGE_TABLE.";");
-}
-
-function wpbb_delete_user_meta() {
-    global $wpdb;
-    $delete_user_meta = $wpdb->query("DELETE FROM ".$wpdb->prefix."usermeta WHERE meta_key LIKE 'wpbb_%';");
-}
-
-function wpbb_delete_post_meta() {
-    global $wpdb;
-    $post_meta = $wpdb->prefix.'postmeta';
-    $key = '_wp_page_template';
-    $value = 'wpbb-template.php';
-    $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '$key' AND meta_value = '$value';");
-    // Delete the meta data
-    delete_post_meta($post_id, $key, $value);
-    // Delete the page
-    wp_delete_post($post_id, true);
+if (!function_exists('wpbb_uninstall'))
+{
+    function wpbb_uninstall()
+    {
+        global $wpdb;
+        delete_option('wpbb_options');
+        delete_option('wpbb_theme_options');
+        delete_option('wpbb_facebook_options');
+        delete_option('wpbb_twitter_options');
+        delete_option('wpbb_guest_options');
+        wpbb_delete_user_meta();
+        wpbb_delete_post_meta();
+        $wpdb->query("DROP TABLE ".CATEGORY_TABLE.", ".TOPICS_TABLE.", ".POSTS_TABLE.", ".MESSAGE_TABLE.", ".UNREAD_TABLE.";");
+    }
+}
+
+if (!function_exists('wpbb_delete_user_meta'))
+{
+    function wpbb_delete_user_meta()
+    {
+        global $wpdb;
+        $delete_user_meta = $wpdb->query("DELETE FROM ".$wpdb->prefix."usermeta WHERE meta_key LIKE 'wpbb_%';");
+    }
+}
+
+if (!function_exists('wpbb_delete_post_meta'))
+{
+    function wpbb_delete_post_meta()
+    {
+        global $wpdb;
+        $post_meta = $wpdb->prefix.'postmeta';
+        $key = '_wp_page_template';
+        $value = 'wpbb-template.php';
+        $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '$key' AND meta_value = '$value';");
+        // Delete the meta data
+        delete_post_meta($post_id, $key, $value);
+        // Delete the page
+        wp_delete_post($post_id, true);
+    }
 }
 
@@ -143 +190 @@
 */
 
-function wpbb_create_db_table() {
-
-    global $wpdb;
-    
-    $options = get_option('wpbb_options');
-    
-    // This is not being activated the first time
-    //if (isset($options['version']) && $options['version'] != WPBB_VERSION) {
-    if ($options) {
-    
-        wpbb_refresh_roles();
-        
-    } else {
-        
+if (!function_exists('wpbb_create_db_table'))
+{
+    function wpbb_create_db_table()
+    {
+        global $wpdb;
+        $options = get_option('wpbb_options');
+        if ($options)
+        {
+            wpbb_refresh_roles();
+        }
         $roles = wpbb_admin_get_all_roles('string', true);
-    
         $perms = "SET($roles) NOT NULL";
-        
         $create_category_query = "CREATE TABLE ".CATEGORY_TABLE." (
             `id` TINYINT(1) UNSIGNED NOT NULL AUTO_INCREMENT,
-            `name` VARCHAR(25) NOT NULL,
+            `name` VARCHAR(30) NOT NULL,
             `description` VARCHAR(200) NOT NULL,
             `forum` TINYINT(1) NOT NULL,
@@ -183 +224 @@
             `id` INT(1) NOT NULL AUTO_INCREMENT,
             `author` SMALLINT(1) NOT NULL,
-            `name` VARCHAR(25) NOT NULL,
+            `name` VARCHAR(35) NOT NULL,
             `content` TEXT NULL,
             `forum` TINYINT(1) NOT NULL,
@@ -215 +256 @@
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
         ";
+    
+        $create_topic_unread_query = "CREATE TABLE ".UNREAD_TABLE." (
+            `id` INT(1) NOT NULL,
+            `author` INT(1) NOT NULL,
+            `read` INT(1) NOT NULL
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+        ";
       
         $create_category_table = $wpdb->query($create_category_query);
@@ -220 +268 @@
         $create_post_table = $wpdb->query($create_post_query);
         $create_message_table = $wpdb->query($create_messages_query);
+        $create_topic_unread_table = $wpdb->query($create_topic_unread_query);
     
-        if ($create_category_table === false) {
+        if ($create_category_table === false)
+        {
             $create_category_table_err = __('There was an error creating the table wpbb_categorie', 'wp-bb');
-            error_log($create_category_table_err);
+            error_log($create_category_table_err);
         } 
-        if ($create_topic_table === false) {
+        if ($create_topic_table === false)
+        {
             $create_topic_table_err = __('There was an error creating the table wpbb_topics', 'wp-bb');
             error_log($create_topic_table_err);
         }
-        if ($create_post_table === false) {
+        if ($create_post_table === false)
+        {
             $create_post_table_err = __('There was an error creating the table wpbb_posts', 'wp-bb');
             error_log($create_post_table_err);
         } 
-        if ($create_message_table === false) {
+        if ($create_message_table === false)
+        {
             $create_message_table_err = __('There was an error creating the table wpbb_messages', 'wp-bb');
             error_log($create_message_table_err);
         }
+        if ($create_topic_unread_table === false)
+        {
+            $create_topic_unread_table_err = __('There was an error creating the table wpbb_topics_unread', 'wp-bb');
+            error_log($create_topic_unread_table_err);
+        }
     }
 }
@@ -244 +302 @@
 */
 
-function wpbb_create_options() {
-    // Retrieve options from database
-    $old_options = get_option('wpbb_options');
-    // If options do not exist
-    if (!$old_options) {
-        $maintenance_message = __('This is the message that will be displayed to users when you disable the board. Edit this in your settings.', 'wp-bb');
-        $forum_name = __('My WPBB Forum', 'wp-bb');
-        $options = array(
-            'maintenance_mode' => 'off',
-            'maintenance_message' => $maintenance_message,
-            'forum_name' => $forum_name,
-            'forum_prefix' => 'no',
-            'allow_guests' => 'yes',
-            'allow_subforums' => 'yes',
-            'enable_quick_reply' => 'yes',
-            'topics_per_page' => 20,
-            'posts_per_page' => 20,
-            'topic_cutoff' => 15,
-            'post_cutoff' => 15,
-            'post_to_forum' => 'yes',
-            'show_footer' => 'no',
-            'version' => WPBB_VERSION
-        );
-        $add_wpbb_options = add_option('wpbb_options', $options);
-    } else {
-        if (!isset($old_options['version'])) {
-            // Attempting to update a key in the options value will remove all the other keys so we must
-            // set all the other keys as well
+if (!function_exists('wpbb_create_options'))
+{
+    function wpbb_create_options()
+    {
+        // Retrieve options from database
+        $old_options = get_option('wpbb_options');
+        /*
+        *   Add all current roles to an array with a default value of 'yes'
+        *   This is for our role permissions
+        */
+        $roles = wpbb_admin_get_all_roles();
+        $role_array = array();
+        if ($roles)
+        {
+            foreach ($roles as $role)
+            {
+                $role_array[$role] = 'yes';
+            }
+        }
+        // If options do not exist
+        if (!$old_options)
+        {
+            $maintenance_message = __('This is the message that will be displayed to users when you disable the board. Edit this in your settings.', 'wp-bb');
+            $forum_name = __('My WPBB Forum', 'wp-bb');
             $options = array(
-                'maintenance_mode' => $old_options['maintenance_mode'],
-                'maintenance_message' => $old_options['maintenance_message'],
-                'forum_name' => $old_options['forum_name'],
-                'forum_prefix' => $old_options['forum_prefix'],
-                'allow_guests' => $old_options['allow_guests'],
-                'allow_subforums' => $old_options['allow_subforums'],
-                'enable_quick_reply' => $old_options['enable_quick_reply'],
-                'topics_per_page' => $old_options['topics_per_page'],
-                'posts_per_page' => $old_options['posts_per_page'],
-                'topic_cutoff' => $old_options['topic_cutoff'],
-                'post_cutoff' => $old_options['post_cutoff'],
-                'post_to_forum' => $old_options['post_to_forum'],
-                'show_footer' => $old_options['show_footer'],
+                'maintenance_mode' => 'off',
+                'maintenance_message' => $maintenance_message,
+                'forum_name' => $forum_name,
+                'allow_guests' => 'yes',
+                'allow_subforums' => 'yes',
+                'enable_quick_reply' => 'yes',
+                'topics_per_page' => 20,
+                'posts_per_page' => 20,
+                'topic_cutoff' => 15,
+                'post_cutoff' => 15,
+                'post_to_forum' => 'yes',
+                'show_footer' => 'no',
+                'role_permissions' => $role_array,
                 'version' => WPBB_VERSION
             );
-            update_option('wpbb_options', $options);
-        }
-    }
-    /* Theme Options */
-    $old_theme_options = get_option('wpbb_theme_options');
-    if (!$old_theme_options) {
-        $add_wpbb_theme_options = add_option('wpbb_theme_options', array('theme' => 'light'));
-    }
-    /* Facebook Options */
-    $old_facebook_options = get_option('wpbb_facebook_options');
-    if (!$old_facebook_options) {
-        $facebook_app_id = __('Enter your Facebook App ID / API Key', 'wp-bb');
-        $facebook_app_secret_key = __('Enter your App Secret Key', 'wp-bb');
-        $facebook_redirect_uri = __('Enter your URL (Redirect URL)', 'wp-bb');
-        $facebook_state = __('Enter a long random string', 'wp-bb');
-        $facebook_role = __('Enter the default role for new facebook registrations');
-        $facebook_options = array(
-            'allow_facebook' => 'no',
-            'facebook_app_id' => $facebook_app_id,
-            'facebook_app_secret_key' => $facebook_app_secret_key,
-            'facebook_redirect_uri' => $facebook_redirect_uri,
-            'facebook_state' => $facebook_state,
-            'facebook_default_role' => $facebook_role
-        );
-        $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
-    }
-    /* Twitter Options */
-    $old_twitter_options = get_option('wpbb_twitter_options');
-    if (!$old_twitter_options) {
-        $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
-        $twitter_options = array(
-            'allow_twitter' => 'no',
-            'twitter_account' => $twitter_account
-        );
-        $add_wpbb_twitter_options = add_option('wpbb_twitter_options', $twitter_options);
-    }
-    $old_guest_options = get_option('wpbb_guest_options');
-    if (!$old_guest_options) {
-        $guest_options = array(
-            'guest_last_post' => '0000-00-00 00:00:00'
-        );
-        $add_wpbb_guest_options = add_option('wpbb_guest_options', $guest_options);
+            $add_wpbb_options = add_option('wpbb_options', $options);
+        }
+        else
+        {
+            if (!isset($old_options['version']))
+            {
+                $options = array(
+                    'maintenance_mode' => $old_options['maintenance_mode'],
+                    'maintenance_message' => $old_options['maintenance_message'],
+                    'forum_name' => $old_options['forum_name'],
+                    'allow_guests' => $old_options['allow_guests'],
+                    'allow_subforums' => $old_options['allow_subforums'],
+                    'enable_quick_reply' => $old_options['enable_quick_reply'],
+                    'topics_per_page' => $old_options['topics_per_page'],
+                    'posts_per_page' => $old_options['posts_per_page'],
+                    'topic_cutoff' => $old_options['topic_cutoff'],
+                    'post_cutoff' => $old_options['post_cutoff'],
+                    'post_to_forum' => $old_options['post_to_forum'],
+                    'show_footer' => $old_options['show_footer'],
+                    'role_permissions' => $role_array,
+                    'version' => WPBB_VERSION
+                );
+                update_option('wpbb_options', $options);
+            }
+        }
+        /* Theme Options */
+        $old_theme_options = get_option('wpbb_theme_options');
+        if (!$old_theme_options)
+        {
+            $add_wpbb_theme_options = add_option('wpbb_theme_options', array('theme' => 'light'));
+        }
+        /* Facebook Options */
+        $old_facebook_options = get_option('wpbb_facebook_options');
+        if (!$old_facebook_options) {
+            $facebook_app_id = __('Enter your Facebook App ID / API Key', 'wp-bb');
+            $facebook_app_secret_key = __('Enter your App Secret Key', 'wp-bb');
+            $facebook_redirect_uri = __('Enter your URL (Redirect URL)', 'wp-bb');
+            $facebook_state = __('Enter a long random string', 'wp-bb');
+            $facebook_role = __('Enter the default role for new facebook registrations');
+            $facebook_options = array(
+                'allow_facebook' => 'no',
+                'facebook_app_id' => $facebook_app_id,
+                'facebook_app_secret_key' => $facebook_app_secret_key,
+                'facebook_redirect_uri' => $facebook_redirect_uri,
+                'facebook_state' => $facebook_state,
+                'facebook_default_role' => $facebook_role
+            );
+            $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
+        }
+        /* Twitter Options */
+        $old_twitter_options = get_option('wpbb_twitter_options');
+        if (!$old_twitter_options)
+        {
+            $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
+            $twitter_options = array(
+                'allow_twitter' => 'no',
+                'twitter_account' => $twitter_account
+            );
+            $add_wpbb_twitter_options = add_option('wpbb_twitter_options', $twitter_options);
+        }
+        $old_guest_options = get_option('wpbb_guest_options');
+        if (!$old_guest_options)
+        {
+            $guest_options = array(
+                'guest_last_post' => '0000-00-00 00:00:00'
+            );
+            $add_wpbb_guest_options = add_option('wpbb_guest_options', $guest_options);
+        }
     }
 }
@@ -337 +417 @@
 */
 
-function wpbb_admin_pages() {
-    
-    $create_category = __('Create Category', 'wp-bb');
-    $create_forum = __('Create Forum', 'wp-bb');
-    $create_subforum = __('Create Subforum', 'wp-bb');
-    $create_topic = __('Create Topic', 'wp-bb');
-    $create_tools = __('Tools', 'wp-bb');
-    $faq_support = __('FAQ & Support', 'wp-bb');
-    $settings = __('WPBB Settings', 'wp-bb');
-
-    // Main WPBB page
-    add_menu_page('WPBB Overview', 'WPBB', 'manage_options', 'wpbb_admin', 'wpbb_admin_display', '', 26);
-    
-    // Create/Edit Category
-    add_submenu_page('wpbb_admin', 'WPBB Categories', $create_category, 'manage_options', 'wpbb_admin_categories', 'wpbb_admin_categories');
-    
-    // Create/Edit Forum
-    add_submenu_page('wpbb_admin', 'WPBB Forums', $create_forum, 'manage_options', 'wpbb_admin_forums', 'wpbb_admin_forums');
-    
-    // Create/Edit Subforum
-    add_submenu_page('wpbb_admin', 'WPBB Subforums', $create_subforum, 'manage_options', 'wpbb_admin_subforums', 'wpbb_admin_subforums');
-    
-    // Create/Edit Topics
-    add_submenu_page('wpbb_admin', 'WPBB Topics', $create_topic, 'manage_options', 'wpbb_admin_topics', 'wpbb_admin_topics');
-    
-    // Create Tools page
-    add_submenu_page('wpbb_admin', 'WPBB Tools', $create_tools, 'manage_options', 'wpbb_admin_tools', 'wpbb_admin_tools');
-    
-    // FAQ / First Installation Page
-    add_submenu_page('wpbb_admin', 'FAQ / Support', $faq_support, 'manage_options', 'wpbb_admin_help', 'wpbb_admin_help');
-    
-    // WPBB Settings
-    add_options_page('WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
-}
-
-function wpbb_create_template_file() {
-    // Get current theme directory
-    $template_directory = get_template_directory();
-    // Check if required template file doesn't exist and if true create it
-    if (!file_exists($template_directory.'/wpbb-template.php')) {
-        // Check directory is writable
-        if (is_writable($template_directory)) { 
-            // Copys wp-bb template file to your current theme
-            $template_file_path = WPBB_DIR.'/wpbb-template.php';
-            $move_template_file = copy($template_file_path, $template_directory.'/wpbb-template.php');
-            if (!$move_template_file) {
-                $move_template_file_failed = sprintf(__('Failed to move required wp-bb template file %s to theme directory %s. Please make sure both the file and directory exist or move the wp-bb template file to your current theme directory manually'), $template_file_path, $template_directory);
-                error_log($move_template_file_failed);
+if (!function_exists('wpbb_admin_pages'))
+{
+    function wpbb_admin_pages()
+    {
+        $create_category = __('Create Category', 'wp-bb');
+        $create_forum = __('Create Forum', 'wp-bb');
+        $create_subforum = __('Create Subforum', 'wp-bb');
+        $create_topic = __('Create Topic', 'wp-bb');
+        $role_permissions = __('Role Permissions', 'wp-bb');
+        $create_tools = __('Tools', 'wp-bb');
+        $faq_support = __('FAQ & Support', 'wp-bb');
+        $settings = __('WPBB Settings', 'wp-bb');
+
+        // Main WPBB page
+        add_menu_page('WPBB Overview', 'WPBB', 'manage_options', 'wpbb_admin', 'wpbb_admin_display', '', 27.7);
+    
+        // Create/Edit Category
+        add_submenu_page('wpbb_admin', 'WPBB Categories', $create_category, 'manage_options', 'wpbb_admin_categories', 'wpbb_admin_categories');
+    
+        // Create/Edit Forum
+        add_submenu_page('wpbb_admin', 'WPBB Forums', $create_forum, 'manage_options', 'wpbb_admin_forums', 'wpbb_admin_forums');
+    
+        // Create/Edit Subforum
+        add_submenu_page('wpbb_admin', 'WPBB Subforums', $create_subforum, 'manage_options', 'wpbb_admin_subforums', 'wpbb_admin_subforums');
+    
+        // Create/Edit Topics
+        add_submenu_page('wpbb_admin', 'WPBB Topics', $create_topic, 'manage_options', 'wpbb_admin_topics', 'wpbb_admin_topics');
+        
+        // Role permissions
+        add_submenu_page('wpbb_admin', 'Role Permissions', $role_permissions, 'manage_options', 'wpbb_admin_role_permissions', 'wpbb_admin_role_permissions');
+    
+        // Create Tools page
+        add_submenu_page('wpbb_admin', 'WPBB Tools', $create_tools, 'manage_options', 'wpbb_admin_tools', 'wpbb_admin_tools');
+    
+        // FAQ / First Installation Page
+        add_submenu_page('wpbb_admin', 'FAQ / Support', $faq_support, 'manage_options', 'wpbb_admin_help', 'wpbb_admin_help');
+        
+        // Shortcut to WPBB settings - some people don't know they exist
+        add_submenu_page('wpbb_admin', 'WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
+    
+        // WPBB Settings
+        add_options_page('WPBB Settings', $settings, 'manage_options', 'wpbb_settings_page', 'wpbb_display_settings');
+    }
+}
+
+
+if (!function_exists('wpbb_create_template_file'))
+{
+    function wpbb_create_template_file()
+    {
+        // Get current theme directory
+        $template_directory = get_template_directory();
+        // Check if required template file doesn't exist and if true create it
+        if (!file_exists($template_directory.'/wpbb-template.php'))
+        {
+            // Check directory is writable
+            if (is_writable($template_directory))
+            { 
+                // Copys wp-bb template file to your current theme
+                $template_file_path = WPBB_DIR.'/wpbb-template.php';
+                $move_template_file = copy($template_file_path, $template_directory.'/wpbb-template.php');
+                if (!$move_template_file)
+                {
+                    $move_template_file_failed = sprintf(__('Failed to move required wp-bb template file %s to theme directory %s. Please make sure both the file and directory exist or move the wp-bb template file to your current theme directory manually'), $template_file_path, $template_directory);
+                    error_log($move_template_file_failed);
+                }
             }
-        } else { // Is not writable and user should change permissions accordingly
-            $template_write_failed = sprintf(__('%s is not writable. Could not create required WPBB template file forum.php. Please change the folders permissions and visit your Wordpress site again or copy the file forum.php from your wp-bb plugin folder to your template folders directory manually.'), $template_directory);
-            error_log($template_write_failed);
-        }
-    }
-}
-
-function wpbb_create_page() {
-    // Check the page doesn't already exist (e.g. when reactivating)
-    global $wpdb;
-    $post_meta = $wpdb->prefix.'postmeta';
-    $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '_wp_page_template' AND meta_value = 'wpbb-template.php';");
-    if ($post_id == NULL) {
-        $wpbb_page_title = __('Forums', 'wp-bb');
-        $link = site_url().'/'.strtolower($wpbb_page_title);
-        $page = array(
-            'post_status' => 'publish',
-            'post_title' => $wpbb_page_title,
-            'comment_status' => 'closed',
-            'post_type' => 'page'
-        );
-        global $forum_page;
-        $forum_page = wp_insert_post($page, false);
-        add_post_meta($forum_page, '_wp_page_template', 'wpbb-template.php', true);
-    }
-    // This function checks if the template file exists before doing anything
-    $template = wpbb_create_template_file();
-}
-
-function wpbb_register_styles() {
-    $wpbb_theme_options = get_option('wpbb_theme_options');
-    if ($wpbb_theme_options['theme'] == 'light') {
-        wp_register_style('wpbb-light-style', plugins_url('wp-bulletin-board/css/wpbb-light-style.css'));
-        wp_enqueue_style('wpbb-light-style');
-    } else {
-        wp_register_style('wpbb-dark-style', plugins_url('wp-bulletin-board/css/wpbb-dark-style.css'));
-        wp_enqueue_style('wpbb-dark-style');
+            else
+            { 
+                // Is not writable and user should change permissions accordingly
+                $template_write_failed = sprintf(__('%s is not writable. Could not create required WPBB template file forum.php. Please change the folders permissions and visit your Wordpress site again or copy the file forum.php from your wp-bb plugin folder to your template folders directory manually.'), $template_directory);
+                error_log($template_write_failed);
+            }
+        }
+    }
+}
+
+if (!function_exists('wpbb_create_page'))
+{
+    function wpbb_create_page()
+    {
+        // Check the page doesn't already exist (e.g. when reactivating)
+        global $wpdb;
+        $post_meta = $wpdb->prefix.'postmeta';
+        $post_id = $wpdb->get_var("SELECT post_id FROM $post_meta WHERE meta_key = '_wp_page_template' AND meta_value = 'wpbb-template.php';");
+        if ($post_id == NULL)
+        {
+            $wpbb_page_title = __('Forums', 'wp-bb');
+            $link = site_url().'/'.strtolower($wpbb_page_title);
+            $page = array(
+                'post_status' => 'publish',
+                'post_title' => $wpbb_page_title,
+                'comment_status' => 'closed',
+                'post_type' => 'page'
+            );
+            global $forum_page;
+            $forum_page = wp_insert_post($page, false);
+            add_post_meta($forum_page, '_wp_page_template', 'wpbb-template.php', true);
+        }
+        // This function checks if the template file exists before doing anything
+        $template = wpbb_create_template_file();
+    }
+}
+
+/*
+    Wordpress post metaboxes
+*/
+
+if (!function_exists('wpbb_post_saved'))
+{
+    function wpbb_post_saved($_post_id)
+    {
+        if (wp_is_post_revision($_post_id))
+        {
+            return;
+        }
+        static $first = true;
+        if (!$first) return;
+        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
+        {
+            return;
+        }
+        $post_metabox_nonce = isset($_POST['wpbb-post-metabox-nonce']);
+        if (!wp_verify_nonce($post_metabox_nonce, plugin_basename(__FILE__)))
+        {
+            return;
+        }
+        $_post_type = isset($_POST['post_type']);
+        if ('post' == $_post_type)
+        {
+            if (!current_user_can('edit_page', $_post_id))
+            {
+                return;
+            }
+        }
+        $post_id = absint($_post_id);
+        $post_data = get_post($post_id, ARRAY_A);
+        $post_to_forum_id = NULL;
+        if (isset($_POST['wpbb-post-to-forum']))
+        {
+            $post_to_forum_id = absint($_POST['wpbb-post-to-forum']);
+        }
+        if ($post_to_forum_id == NULL)
+        {
+            error_log(__('When copying the post to a WPBB forum, the wpbb-post-to-forum was NULL - a forum ID wasn\'t provided'));
+        }
+        $is_forum = NULL;
+        $is_subforum = NULL;
+        global $wpdb;
+        // Check to see if this forum is a forum or a subforum
+        $forum_or_subforum = $wpdb->get_results("SELECT `forum`, `subforum` FROM ".CATEGORY_TABLE." WHERE id = $post_to_forum_id;");
+        if ($forum_or_subforum)
+        {
+            foreach ($forum_or_subforum as $forum)
+            {
+                if ($forum->forum > 0 && $forum->subforum == 0)
+                {
+                    // Forum
+                    $is_forum = true;
+                    $is_subforum = false;
+                }
+                else if ($forum->subforum > 0 && $forum->forum == 0)
+                {
+                    // Subforum
+                    $is_subforum = true;
+                    $is_forum = false;
+                }
+            }
+        }
+        if ($post_data)
+        {
+            $forum_id = ($is_forum) ? $post_to_forum_id : 0;
+            $subforum_id = ($is_subforum) ? $post_to_forum_id : 0;
+            $data = array(
+                'name' => $post_data['post_title'],
+                'author' => $post_data['post_author'],
+                'content' => $post_data['post_content'],
+                'forum' => $forum_id,
+                'subforum' => $subforum_id,
+                'status' => '',
+                'created' => $post_data['post_date'],
+                'last_reply' => $post_data['post_date']
+            );
+            $copy_post_to_forum = $wpdb->insert(TOPICS_TABLE, $data);
+            if ($copy_post_to_forum === false)
+            {
+                error_log(__('Failed to copy the wordpress post to the wpbb forum', 'wp-bb'));
+            }
+            else
+            {
+                // Update authors post count
+                wpbb_admin_update_user_meta($post_data['post_author'], 'increase');
+                $first = false;
+            }
+        }
+    }
+}
+
+if (!function_exists('wpbb_display_metaboxes'))
+{
+    function wpbb_display_metaboxes()
+    {
+        global $wpdb;
+        wp_nonce_field(plugin_basename(__FILE__), 'wpbb-post-metabox-nonce');
+        ?>
+        <div id="minor-publishing-actions">
+            <p class="description">Send a copy of this post to one of your WPBB forums or subforums or check "None" or disable this in your WPBB Settings</p>
+            <select name="wpbb-post-to-forum">
+                <!-- Default -->
+                <option value="0">None</option>
+                <?php
+                // All forums and subforums
+                $forums = $wpdb->get_results("SELECT `id`, `name` FROM ".CATEGORY_TABLE." WHERE forum > 0 || subforum > 0;");
+                if ($forums)
+                {
+                    foreach ($forums as $forum)
+                    {
+                        ?>
+                        <option value="<?php echo $forum->id; ?>"><?php echo $forum->name;?></option>
+                        <?php
+                    }
+                }
+                ?>
+            </select>
+        </div>
+        <?php
+    }
+}
+
+if (!function_exists('wpbb_create_metaboxes'))
+{
+    function wpbb_create_metaboxes()
+    {
+        add_meta_box('wpbb-post-to-forum-meta-box', __('Post to WPBB Forum', 'wp-bb'), 'wpbb_display_metaboxes', 'post', 'side', 'high', NULL);
+    }
+}
+
+/*
+    Register and loads the style and javascript files depending on settings
+*/
+
+if (!function_exists('wpbb_register_styles'))
+{
+    function wpbb_register_styles()
+    {
+        $wpbb_theme_options = get_option('wpbb_theme_options');
+        if ($wpbb_theme_options['theme'] == 'light')
+        {
+            wp_register_style('wpbb-light-style', plugins_url('wp-bulletin-board/css/wpbb-light-style.css'));
+            wp_enqueue_style('wpbb-light-style');
+        }
+        else
+        {
+            wp_register_style('wpbb-dark-style', plugins_url('wp-bulletin-board/css/wpbb-dark-style.css'));
+            wp_enqueue_style('wpbb-dark-style');
+        }
+        wp_enqueue_script('jquery');
+        wp_register_script('wpbb-search', plugins_url('wp-bulletin-board/js/wpbb-search.js'), 'jquery');
+        wp_enqueue_script('wpbb-search');
     }
 }
@@ -432 +685 @@
 */
 
-function wpbb_admin_display() {
-    require_once('php/admin/wpbb-admin-main.php');
-}
+if (!function_exists('wpbb_admin_display'))
+{
+    function wpbb_admin_display()
+    {
+        require_once('php/admin/admin-main.php');
+    }
+}
+
 
 
@@ -441 +699 @@
 */
 
-function wpbb_admin_categories() {
-    require_once('php/admin/wpbb-admin-categories.php');
+if (!function_exists('wpbb_admin_categories'))
+{
+    function wpbb_admin_categories()
+    {
+        require_once('php/admin/admin-categories.php');
+    }
 }
 
@@ -449 +711 @@
 */
 
-function wpbb_admin_forums() {
-    require_once('php/admin/wpbb-admin-forums.php');
+if (!function_exists('wpbb_admin_forums'))
+{
+    function wpbb_admin_forums()
+    {
+        require_once('php/admin/admin-forums.php');
+    }
 }
 
@@ -457 +723 @@
 */
 
-function wpbb_admin_subforums() {
-    require_once('php/admin/wpbb-admin-subforums.php');
+if (!function_exists('wpbb_admin_subforums'))
+{
+    function wpbb_admin_subforums()
+    {
+        require_once('php/admin/admin-subforums.php');
+    }
 }
 
@@ -465 +735 @@
 */
 
-function wpbb_admin_topics() {
-    require_once('php/admin/wpbb-admin-topics.php');
+if (!function_exists('wpbb_admin_topics'))
+{
+    function wpbb_admin_topics()
+    {
+        require_once('php/admin/admin-topics.php');
+    }
+}
+
+/* 
+    Role Permissions
+*/
+
+if (!function_exists('wpbb_admin_role_permissions'))
+{
+    function wpbb_admin_role_permissions()
+    {
+        require_once('php/admin/admin-role-permissions.php');
+    }
 }
 
@@ -473 +759 @@
 */
 
-function wpbb_admin_tools() {
-    require_once('php/admin/wpbb-admin-tools.php');
+if (!function_exists('wpbb_admin_tools'))
+{
+    function wpbb_admin_tools()
+    {
+        require_once('php/admin/admin-tools.php');
+    }
 }
 
@@ -481 +771 @@
 */
 
-function wpbb_admin_help() {
-    require_once('php/admin/wpbb-admin-faq-support.php');
-}
-
+if (!function_exists('wpbb_admin_help'))
+{
+    function wpbb_admin_help()
+    {
+        require_once('php/admin/admin-faq-support.php');
+    }
+}
 
 /*
@@ -490 +783 @@
 */
 
-function wpbb_display_settings() {
-    require_once('php/admin/wpbb-admin-settings.php');
+if (!function_exists('wpbb_display_settings'))
+{
+    function wpbb_display_settings()
+    {
+        require_once('php/admin/admin-settings.php');
+    }
 }