Changeset 607181

wp-bulletin-board/tags/1.0.2/css/wpbb-dark-style.css

-                      r604652
+                      r607181
 /* Used for most messages */
+/* <h1> heading 1 */
+#wpbb-h-1 {
+    font-size:24px;
+}
 /* Centers text */
 .wpbb-centered {
 …
 #wpbb-search {
     float:right;
+}
-/* This is a message displayed to an admin to remind them the board is in maintenance mode */
-#wpbb-admin-maintenance-reminder {
-    text-align:center;
-    background-color: yellow;
+}
-/* This is the message displayed to users when the board is in maintenance mode (excludes admins unless logged out) */
-#wpbb-maintenance-message {
-    text-align:center;
-    font-weight:bold;
+}
 …
 /* Credit to http://css.dzone.com/news/css-message-boxes-different-me /*
 /* Layout for the success and failure messages */
 .wpbb-message-success, .wpbb-message-failure {
+.wpbb-message-success, .wpbb-message-failure, .wpbb-message-warning {
     border: 1px solid;
     margin: 10px 0px;
 …
+}
+/* Warning message background and font color */
+.wpbb-message-warning {
+    color: #9F6000;
+    background-color: #FEEFB3;
+    text-align:center;
+}
 /* The create/reply buttons when viewing a forum/subforum/topic */
 .wpbb-topic-buttons {
 …
+}
 /* The quick reply on a topic */
+/* The quick reply div at bottom of a topic */
 .wpbb-quick-reply {
     margin-left:auto;
     margin-right:auto;
-    width:50%;
     margin-bottom:100px;
     text-align:center;
+}
+/* The textarea element used for the quick reply content - determines its width/height*/
+.wpbb-quick-reply textarea {
+    min-width: 400px;
+    min-height: 100px;
+}

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

-                      r604862
+                      r607181
 /* Used for most messages */
+/* <h1> heading 1 */
+#wpbb-h-1 {
+    font-size:24px;
+}
 /* Centers text */
 .wpbb-centered {
 …
+}
-/* This is a message displayed to an admin to remind them the board is in maintenance mode */
-#wpbb-admin-maintenance-reminder {
-    text-align:center;
-    background-color: yellow;
+}
-/* This is the message displayed to users when the board is in maintenance mode (excludes admins unless logged out) */
-#wpbb-maintenance-message {
-    text-align:center;
-    font-weight:bold;
+}
 /* Defines the layout of all tables displayed on the front end */
 /* Credit to twentyelevens entry-content table as I used that as my table class when developing the plugin and and may use some styling or bare resemblance to it */
 .wpbb-table {
     width: 100%;
+    width:100%;
     border: solid 0.1em;
     border-color: #9E9E9E;
 …
     margin-left:auto;
     margin-right:auto;
+    width:50%;
+    text-align:center;
+}
+#wpbb-profile-signature textarea {
+    min-width:400px;
+    min-height:100px;
+    max-width: 400px;
+    max-height: 100px;
+}
 /* Credit to http://css.dzone.com/news/css-message-boxes-different-me /*
 /* Layout for the success and failure messages */
 .wpbb-message-success, .wpbb-message-failure {
+.wpbb-message-success, .wpbb-message-failure, .wpbb-message-warning {
     border: 1px solid;
     margin: 10px 0px;
 …
+}
+/* Warning message background and font color */
+.wpbb-message-warning {
+    color: #9F6000;
+    background-color: #FEEFB3;
+    text-align:center;
+}
 /* Search Bar */
 #wpbb-search {
 …
     margin-top:auto;
     border: 0;
     width: 80%;
+    width: auto;
+}
 …
+}
 /* The quick reply textarea at bottom of a topic */
+/* The quick reply div at bottom of a topic */
 .wpbb-quick-reply {
     margin-left:auto;
     margin-right:auto;
-    width:50%;
     margin-bottom:100px;
     text-align:center;
+}
+/* The textarea element used for the quick reply content - determines its width/height*/
+.wpbb-quick-reply textarea {
+    min-width:400px;
+    min-height:100px;
+    max-width: 400px;
+    max-height: 100px;
+}
+#wpbb-message-subject-date {
+    float:left;
+}

wp-bulletin-board/tags/1.0.2/php/admin/wpbb-admin-categories.php

-                      r603518
+                      r607181
         foreach ($roles as $role) {
             if ($_POST['wpbbadvancedpermissionstable'.$role.'view']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'view'])) {
                 $permissions['view'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'read']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'read'])) {
                 $permissions['read'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'post']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'post'])) {
                 $permissions['post'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'reply']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'reply'])) {
                 $permissions['reply'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'edit']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'edit'])) {
                 $permissions['edit'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'lock']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'lock'])) {
                 $permissions['lock'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'delete']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'delete'])) {
                 $permissions['delete'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'sticky']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'sticky'])) {
                 $permissions['sticky'][] = $role;
+            }
+        }
+        // This is a category
+        $forum_id = 0;
+        $subforum_id = 0;
         $view_permissions = implode(",", $permissions['view']);
 …
         $data = array(
             'name' => $name,
             'forum' => 0,
             'subforum' => 0,
+            'forum' => $forum_id,
+            'subforum' => $subforum_id,
             'view' => $view_permissions,
             'read' => $read_permissions,
 …
         if ($update_forum) {
+            //echo "<div id='message' class='updated'>Category ID ".$id." updated succesfully </div>";
+            echo "<div id='message' class='updated'>";
+            printf(__('Category ID %d updated successfully', 'wp-bb'), $id);
+            echo "</div>";
+            ?>
+            <div id='message' class='updated'>
+                <?php printf(__('Category ID %d updated successfully', 'wp-bb'), $id); ?>
+            </div>
+            <?php
         } else {
             //echo "<div id='message' class='error'>Error updating Category ID ".$id."</div>";
             echo "<div id='message' class='error'>";
             printf(__('Error updating Category ID %d', 'wp-bb'), $id);
             echo "</div>";
+            ?>
+            <div id='message' class='error'>
+                <?php printf(__('Error updating Category ID %d', 'wp-bb'), $id); ?>
+            </div>
+            <?php
+        }
+    }
 …
         if ($delete === false) {
+            //echo "<div id='message' class='error'>There was an error deleting Category ID ".$id." from the database.</div>";
+            echo "<div id='message' class='error'>";
+            printf(__('There was an error deleting Category ID %d, please try again.', 'wp-bb'), $id);
+            echo "</div>";
+            ?>
+            <div id='message' class='error'>
+                <?php printf(__('There was an error deleting Category ID %d, please try again.', 'wp-bb'), $id); ?>
+            </div>
+            <?php
         } else {
             echo "<div id='message' class='updated'>";
             //echo "<div id='message' class='updated'>Category ID ".$id." deleted successfully.</div>";
             printf(__('Category ID %d deleted successfully.', 'wp-bb'), $id);
             echo "</div>";
+            ?>
+            <div id='message' class='updated'>
+                <?php printf(__('Category ID %d deleted successfully.', 'wp-bb'), $id); ?>
+            </div>
+            <?php
+        }
 …
     $id = absint($_GET['id']);
     echo "<h3>".__('Confirm Delete Request', 'wp-bb')."</h3>";
+    //echo "Are you sure you want to delete Category ID ".$id."?";
     printf(__('Are you sure you want to delete Category ID %d?', 'wp-bb'), $id);
     echo "<form method='POST' action='#'>";
     echo "<input type='radio' name='wpbb-confirm-delete' value='yes' checked='no' /> ".__('Yes', 'wp-bb');
     echo "<input type='radio' name='wpbb-confirm-delete' value='no' checked='no' /> ".__('No', 'wp-bb');
     echo "<input type='hidden' name='wpbb-confirm-delete-id' value='".$id."' />";
     echo "<input type='submit' name='wpbb-confirm-delete-submit' value='".__('Confirm', 'wp-bb')."' />";
     echo "</form>";
+    ?>
+    <h3><?php _e('Confirm Delete Request', 'wp-bb'); ?></h3>
+    <?php printf(__('Are you sure you want to delete Category ID %d?', 'wp-bb'), $id); ?>
+    <form method='POST' action='#'>
+        <input type='radio' name='wpbb-confirm-delete' value='yes' checked='no' /> <?php _e('Yes', 'wp-bb'); ?>
+        <input type='radio' name='wpbb-confirm-delete' value='no' checked='no' /> <?php _e('No', 'wp-bb'); ?>
+        <input type='hidden' name='wpbb-confirm-delete-id' value='<?php echo $id; ?>' />
+        <input type='submit' name='wpbb-confirm-delete-submit' value='<?php _e('Confirm', 'wp-bb'); ?>' />
+    </form>
+    <?php
     return;
+}

wp-bulletin-board/tags/1.0.2/php/admin/wpbb-admin-faq-support.php

-                      r603518
+                      r607181
         <dl>
             <dt><b><?php _e('Support Forums', 'wp-bb'); ?></b></dt>
             <dd>http://codebycarter.com/wpbb/forums</dd>
+            <dd>http://wordpress.org/support/plugin/wp-bulletin-board</dd>
             <dt><b><?php _e('Author Email', 'wp-bb'); ?></b></dt>
             <dd>[email protected]</dd>
 …
                 <b>
                     <?php
-                        $options = get_option('wpbb_options');
                         _e('Your version', 'wp-bb');
                     ?>
 …
             <dd>
                 <?php
+                if (isset($options['version'])) {
+                    $options['version'];
+                } else {
+                    _e('Unknown version', 'wp-bb');
+                }
+                    echo WPBB_VERSION;
                 ?>
             </dd>

wp-bulletin-board/tags/1.0.2/php/admin/wpbb-admin-settings.php

-                      r603518
+                      r607181
     (string) $facebook_state = wp_strip_all_tags($_POST['wpbbfacebookstate']);
+    $faceboook_default_role = strtolower(wp_strip_all_tags($_POST['wpbbfacebookdefaultrole']));
     $new_facebook_options = array(
         'allow_facebook' => $facebook_support,
 …
         'facebook_app_secret_key' => $facebook_app_secret_key,
         'facebook_redirect_uri' => $facebook_redirect_uri,
+        'facebook_state' => $facebook_state
+        'facebook_state' => $facebook_state,
+        'facebook_default_role' => $faceboook_default_role
     );
 …
                 </th>
                 <td>
+                <?php
+                    if (isset($facebook_options['facebook_app_id'])) {
+                        $facebook_app_id_value = $facebook_options['facebook_app_id'];
+                    } else {
+                        $facebook_app_id_value = "Enter your App ID / API Key";
+                    }
+                    if (isset($facebook_options['facebook_app_secret_key'])) {
+                        $facebook_app_secret_key_value = $facebook_options['facebook_app_secret_key'];
+                    } else {
+                        $facebook_app_secret_key_value = "Enter your App Secret Key";
+                    }
+                    if (isset($facebook_options['facebook_redirect_uri'])) {
+                        $facebook_redirect_uri_value = $facebook_options['facebook_redirect_uri'];
+                    } else {
+                        $facebook_redirect_uri_value = "http://www.yoursite.com";
+                    }
+                    if (isset($facebook_options['facebook_state'])) {
+                        $facebook_state_value = $facebook_options['facebook_state'];
+                    }
+                ?>
+                    <?php
+                    // App ID
+                    $facebook_app_id_value = (isset($facebook_options['facebook_app_id'])) ? $facebook_options['facebook_app_id'] : "Enter your App ID / API Key";
+                    // App secret key
+                    $facebook_app_secret_key_value = (isset($facebook_options['facebook_app_secret_key'])) ? $facebook_options['facebook_app_secret_key'] : "Enter your App Secret Key";
+                    // Redirect URL
+                    $facebook_redirect_uri_value = (isset($facebook_options['facebook_redirect_uri'])) ? $facebook_options['facebook_redirect_uri'] : "http://www.yoursite.com";
+                    // Facebook state
+                    $facebook_state_value = (isset($facebook_options['facebook_state'])) ? $facebook_options['facebook_state'] : 'Enter a unique string (letters and numbers only';
+                    // Facebook default role
+                    $facebook_default_role = (isset($facebook_options['facebook_default_role'])) ? $facebook_options['facebook_default_role'] : 'Enter a default role for new Facebook registrations';
+                    ?>
                     <input type='text' name='wpbbfacebookappid' value="<?php echo $facebook_app_id_value; ?>"/>
                 </td>
 …
                 </th>
                 <td>
                     <input type='text' name='wpbbfacebookredirecturi' value="<?php echo $facebook_redirect_uri_value; ?>"/>
+                    <input type='text' name="wpbbfacebookredirecturi" value="<?php echo $facebook_redirect_uri_value; ?>"/>
                 </td>
             </tr>
 …
                 </th>
                 <td>
+                    <input type='text' name='wpbbfacebookstate' value="<?php echo $facebook_state_value; ?>" />
+                </td>
+            </tr>
+            <tr>
+                    <input type="text" name="wpbbfacebookstate" value="<?php echo $facebook_state_value; ?>" />
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    <label for="wpbbfacebookdefaultrole"><?php _e('Default Role', 'wp-bb'); ?></label>
+                </th>
+                <td>
+                    <input type="text" name="wpbbfacebookdefaultrole" value="<?php echo strtolower($facebook_default_role); ?>"/>
+                </td>
+            </tr>
+            <tr>
                 <td><input type="submit" name="wpbb-facebook-settings-submit" class="button-primary" value="<?php _e('Save Changes', 'wp-bb'); ?>" /></td>
             </tr>

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

-                      r603518
+                      r607181
 } else { // User is not logged in
-    if (!isset($_GET['state']) && !isset($_GET['code'])) {
-        ?>
-        <div class="wpbb-centered-bold">
-            <a href='<?php echo wpbb_get_facebook_login(); ?>'><?php _e('Login using Facebook', 'wp-bb'); ?></a>
-            <?php _e('or', 'wp-bb'); ?>
-            <a href='<?php echo add_query_arg(array('register' => '', 'method' => 'facebook'), get_permalink()); ?>'><?php _e('Register using Facebook', 'wp-bb'); ?></a>
-        </div>
-        <?php
+    }
     // Registering for a Wordpress account through Facebook
     if ((isset($_GET['register'])) && (isset($_GET['method'])) && (count($_GET) == 2)) {
+        $registration_enabled = get_option('users_can_register');
+        if (!$registration_enabled) {
+            ?>
+            <div class="wpbb-centered">
+                <?php
+                    _e('Sorry, the administrator has disabled user registrations.', 'wp-bb');
+                    wpbb_exit();
+                ?>
+            </div>
+            <?php
+        }
         ?>
         <h2 class="wpbb-centered-bold">
 …
                     if ($facebook_user['id'] != 0) { // User is logged into Facebook
                         $logged_into_facebook = true;
                         if (!isset($facebook_user['email'])) {
+                            _e('Could not log you in using Facebook. You must authorize the app to allow it to use your email address for validation', 'wp-bb');
+                            exit();
+                            ?>
+                            <div class="wpbb-message-failure">
+                                <?php
+                                _e('Could not log you in using Facebook. You must authorize the app to allow it to use your email address for validation', 'wp-bb');
+                                ?>
+                            </div>
+                            <?php
+                            wpbb_exit();
+                        }
                         $email_exists = email_exists($facebook_user['email']);
                         if ($email_exists === false) {
+                            _e('You must register for an account using Wordpress or Facebook before logging in.', 'wp-bb');
+                            exit();
+                        }
+                            ?>
+                            <div class="wpbb-message-failure">
+                                <?php
+                                _e('You must register for an account using Wordpress or Facebook before logging in.', 'wp-bb');
+                                ?>
+                            </div>
+                            <?php
+                            wpbb_exit();
+                        }
                         ?>
                         <h2 class="wpbb-centered-bold">
+                        <?php _e('Login to Wordpress', 'wp-bb'); ?>
+                        </h2><br />
+                        <div class="wpbb-centered">
+                        <?php printf(__('Thankyou 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
+                        $forum_page_url = get_page($forum_page);
+                        $args = array(
+                            'echo' => true,
+                            'redirect' => $forum_page_url->guid,
+                            'remember' => true,
+                            'value_username' => $facebook_user['name'],
+                            'value_remember' => 1
+                        );
+                        $user = get_user_by('email', $facebook_user['email']);
+                        $access_token = wp_strip_all_tags($para['access_token']);
+                        $add_user_facebook_meta = update_user_meta($user->ID, 'wpbb_facebook_access_token', $access_token);
+                        wp_login_form($args);
+                        ?>
+                            <?php _e('Login to Wordpress', 'wp-bb'); ?>
+                        </h2>
+                        <br />
+                        <div class="wpbb-centered">
+                            <?php printf(__('Thankyou 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
+                            $forum_page_url = get_page($forum_page);
+                            $args = array(
+                                'echo' => true,
+                                'redirect' => $forum_page_url->guid,
+                                'remember' => true,
+                                'value_username' => $facebook_user['name'],
+                                'value_remember' => 1
+                            );
+                            $user = get_user_by('email', $facebook_user['email']);
+                            $access_token = wp_strip_all_tags($para['access_token']);
+                            $add_user_facebook_meta = update_user_meta($user->ID, 'wpbb_facebook_access_token', $access_token);
+                            wp_login_form($args);
+                            ?>
                         </div>
                         <?php
                     } else {
                         _e('Please login to Facebook', 'wp-bb');
+                    }
+                }
             } else { // Possible CSRF victim
+                _e('There was an error logging you into Facebook. Please try again', 'wp-bb');
+                exit();
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php
+                    _e('There was an error logging you into Facebook. Please try again', 'wp-bb');
+                    ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
         } else { // State was not provided
+            _e('You must provide a state (a random string of variable length) in your Facebook Settings');
+            exit();
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
+                _e('You must provide a state (a random string of variable length) in your Facebook Settings');
+                ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
 …
     $password = $data['registration']['password'];
     $email = $data['registration']['email'];
+    $create_user = wp_create_user($username, $password, $email);
+    $facebook_options = get_option('wpbb_facebook_options');
+    $role = $facebook_options['facebook_default_role'];
+    //$create_user = wp_create_user($username, $password, $email);
+    $create_user = wp_insert_user(array('user_login' => $username, 'user_pass' => $password, 'user_email' => $email, 'role' => $role));
     if (is_wp_error($create_user)) {
         $errors = $create_user->get_error_messages();
-        var_dump($errors);
         foreach ($errors as $err) {
+            echo $err;
+        }
+        exit();
+            wpbb_goback1('facebook-register-uname-exists', NULL);
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
+                echo $err;
+                ?>
+            </div>
+            <?php
+        }
+        wpbb_exit();
     } else {
+        _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+        // Display login form
+        wp_login_form();
+        ?>
+        <div class="wpbb-message-success">
+            <?php
+            _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+            ?>
+        </div>
+        <div class="wpbb-centered">
+            <?php
+            wp_login_form();
+            ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+}

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

-                      r603518
+                      r607181
     Displays Twitter Follow button if twitter is enabled
 */
+$twitter_username = "http://api.twitter.com/1/users/show.xml?screen_name=".$wpbb_twitter_options['twitter_account'];
+if (!@fopen($twitter_username, 'r')) {
+    ?>
+    <div class="wpbb-message-failure">
+        <p>Invalid twitter username supplied. Please enter a correct username or disable twitter support.</p>
+    </div>
+    <?php
+}
 if (count($_GET) == 0) {

wp-bulletin-board/tags/1.0.2/php/wpbb-all-messages.php

-                      r604868
+                      r607181
 <?php
+wpbb_goback1('all-messages', NULL);
+$user_id = get_current_user_id();
+if ($user_id == 0) {
+    ?>
+    <div class="wpbb-centered-bold">
+        <?php
+            _e('Please register or login to view this page', 'wp-bb');
+            wpbb_exit();
+        ?>
+    </div>
+    <?php
+}
+$user_id = wpbb_is_user_logged_in();
 global $wpdb;
+?>
+<h1 id="wpbb-h-1" class="wpbb-centered-bold">
+    <?php _e('My Messages', 'wp-bb'); ?>
+</h1>
+<a href='<?php echo add_query_arg(array('message' => 'to'), wpbb_permalink()); ?>'>
+    <p class="wpbb-centered">
+            <?php _e('Compose Message', 'wp-bb'); ?>
+    </p>
+</a>
+<?php
+// Viewing all messages
+if ((isset($_GET['messages']))
+    && ($_GET['messages'] == 'all')
+    && (count($_GET) == 1 || count($_GET) == 2)) {
+    ?>
+    <h2 class="wpbb-centered-bold">
+        <?php _e('My Messages', 'wp-bb'); ?>
+    </h2>
+    <a href='<?php echo add_query_arg(array('message' => 'to'), get_permalink()); ?>'>
+        <p class="wpbb-centered">
+            <?php _e('Compose Message', 'wp-bb'); ?>
+        </p>
+    </a>
+    <?php
+        if ($user_id != 0) {
+            $options = get_option('wpbb_options');
+            $topics_per_page = $options['topics_per_page'];
+            if (isset($_GET['current_page'])) {
+                if ($_GET['current_page'] == 0) {
+                    $current_page = 1;
+                    $start = 0;
+                    $limit = $topics_per_page;
+                } else if ($_GET['current_page'] == 1) {
+                    $current_page = 1;
+                    $start = 0;
+                    $limit = $topics_per_page;
+                } else {
+                    $current_page = $_GET['current_page'];
+                    $start = $current_page * $topics_per_page - $topics_per_page;
+                    $limit = $start + $topics_per_page;
+                }
+            }
+            $total_msgs = $wpdb->get_var("SELECT COUNT(*) as 'Messages' FROM ".MESSAGES_TABLE." WHERE `to` = $user_id;");
+            $msgs = false;
+            if ($total_msgs > 0) {
+                wpbb_pagination(NULL, $current_page, $start, $limit, $total_msgs, $topics_per_page, true, 'messages');
+                $msgs = $wpdb->get_results("SELECT * FROM ".MESSAGES_TABLE." WHERE `to` = $user_id ORDER BY sent DESC LIMIT $start, $limit;");
+            }
+            if ($msgs) {
+                ?>
+                <table class="wpbb-table">
+                <th><?php _e('From', 'wp-bb'); ?></th>
+                <th><?php _e('Subject', 'wp-bb'); ?></th>
+                <th><?php _e('Read', 'wp-bb'); ?></th>
+                <th><?php _e('Sent', 'wp-bb'); ?></th>
+                <th><?php _e('Action', 'wp-bb'); ?></th>
+if ($user_id != 0) {
+    $options = get_option('wpbb_options');
+    $topics_per_page = $options['topics_per_page'];
+    if (isset($_GET['current_page'])) {
+        if ($_GET['current_page'] == 0) {
+            $current_page = 1;
+            $start = 0;
+            $limit = $topics_per_page;
+        } else if ($_GET['current_page'] == 1) {
+            $current_page = 1;
+            $start = 0;
+            $limit = $topics_per_page;
+        } else {
+            $current_page = $_GET['current_page'];
+            $start = $current_page * $topics_per_page - $topics_per_page;
+            $limit = $start + $topics_per_page;
+        }
+    }
+    $total_msgs = $wpdb->get_var("SELECT COUNT(*) as 'Messages' FROM ".MESSAGES_TABLE." WHERE `to` = $user_id;");
+    $msgs = false;
+    if (($total_msgs > 0) && ($total_msgs > $topics_per_page)) {
+        wpbb_pagination(NULL, $current_page, $start, $limit, $total_msgs, $topics_per_page, true, 'messages');
+        $msgs = $wpdb->get_results("SELECT * FROM ".MESSAGES_TABLE." WHERE `to` = $user_id ORDER BY sent DESC LIMIT $start, $limit;");
+    }
+    if ($msgs) {
+        wpbb_goback1('all-messages', NULL);
+        ?>
+        <table class="wpbb-table">
+            <th><?php _e('From', 'wp-bb'); ?></th>
+            <th><?php _e('Subject', 'wp-bb'); ?></th>
+            <th><?php _e('Read', 'wp-bb'); ?></th>
+            <th><?php _e('Sent', 'wp-bb'); ?></th>
+            <th><?php _e('Action', 'wp-bb'); ?></th>
                 <?php
                 foreach ($msgs as $msg) {
 …
                         <td>
                             <a href='<?php echo add_query_arg(array('messages' => 'all', 'view' => $msg->id)); ?>'>
+                            <a href='<?php echo add_query_arg(array('messages' => 'all', 'view' => $msg->id), wpbb_permalink()); ?>'>
                                 <?php printf(__('%s'), $msg->subject); ?>
                             </a>
 …
                         </td>
                         <td>
                             <a href='<?php echo add_query_arg(array('delete_msg' => $msg->id)); ?>'>
+                            <a href='<?php echo add_query_arg(array('messages' => 'all', 'delete_msg' => $msg->id), wpbb_permalink()); ?>'>
                                 <?php _e('Delete', 'wp-bb'); ?>
+                            </a>
+                            <a href="<?php echo add_query_arg(array('message' => $msg->from), wpbb_permalink()); ?>">
+                                <?php _e('Reply', 'wp-bb'); ?>
                             </a>
                         </td
 …
             <?php
         } else {
+            wpbb_goback1('all-messages', NULL);
             ?>
             <div class="wpbb-centered-bold">
                 <?php _e('You do not have any messages', 'wp-bb'); ?>
+            <div class="wpbb-message-failure">
+                <?php printf(__('You do not have any messages. <a href="%s">Compose one?</a>'), add_query_arg(array('message' => 'to'), wpbb_permalink())); ?>
             </div>
         <?php
+        }
+    }
+}
-// Deleting a message
-if ((isset($_GET['delete_msg']))
-    && (isset($_GET['messages']))
-    && (count($_GET) === 2)) {
-    $id = absint($_GET['delete_msg']);
-    $delete_message = $wpdb->query("DELETE FROM ".MESSAGES_TABLE." WHERE id = $id;");
-    if ($delete_message === false) {
-        ?>
-        <div class="wpbb-centered-bold">
-            <?php _e('Error deleting message. Please try again', 'wp-bb'); ?>
-        </div>
-        <?php
-    } else {
-        ?>
-        <div class="wpbb-centered-bold">
-        <?php _e('Thankyou. That message has been deleted successfully.', 'wp-bb'); ?>
-        </div>
-        <?php
+    }
+}
 ?>

wp-bulletin-board/tags/1.0.2/php/wpbb-create-topic.php

r604652	r607181
4	4
5	5	$forum_id = absint($_GET['forum']);
	6
	7	wpbb_check_exists('forum', $forum_id);
6	8
7	9	if ((isset($_GET['forum'])) && (!isset($_GET['subforum']))) {

wp-bulletin-board/tags/1.0.2/php/wpbb-delete-topic.php

-                      r603518
+                      r607181
 <?php
+    wpbb_goback1();
     // Check user has permissions to delete topics or posts in this forum
 …
                 ?>
                 <div class="wpbb-centered-bold">
+                    <?php printf(__('You decided not to delete topic ID %s. You will be redirected'), $topic_id); ?>
+                    <?php
+                        printf(__('You decided not to delete topic ID %s. Click "Go back" to return to the topic.'), $topic_id);
+                    ?>
                 </div>
                 <?php
 …
         if ($changed_mind !== true && $success !== true) {
             ?>
             <h2 class="wpbb-centered-bold"><?php _e('Confirm Topic Delete Request', 'wp-bb'); ?></h2>
             <div class="wpbb-centered-bold">
                 <?php printf(__('Are you sure you want to delete topic ID %s ? (WARNING: All posts in this topic will be deleted. This proccess cannot be undone!)'), $topic_id); ?>
+            <h1 id="wpbb-h-1" class="wpbb-centered-bold"><?php _e('Confirm Topic Delete Request', 'wp-bb'); ?></h1>
+            <div class="wpbb-message-warning">
+                <?php printf(__('Are you sure you want to delete topic ID %s? WARNING: All posts in this topic will be deleted. This proccess cannot be undone!'), $topic_id); ?>
             </div>
             <form method='POST' action='#' style='text-align:center;'>

wp-bulletin-board/tags/1.0.2/php/wpbb-edit-topic.php

-                      r604652
+                      r607181
 <?php
+    if ((isset($_GET['topic'])) && (!isset($_GET['post']))) {
+        $is_topic = true;
+        $is_post = false;
+    }
+    if ((isset($_GET['post'])) && (isset($_GET['topic']))) {
+        $is_post = true;
+        $is_topic = false;
+    }
+    $forum_id = absint($_GET['forum']);
+    $user_id = get_current_user_id();
+    $topic_id = absint($_GET['topic']);
+    if (isset($_GET['post'])) {
+        $post_id = absint($_GET['post']);
+    }
+    $view_permissions = wpbb_user_has_permission($user_id, $forum_id);
+    if ($view_permissions === false) {
+        wpbb_goback1('edit-topic-denied', NULL);
+        ?>
+        <div class="wpbb-message-failure">
+            <?php _e('You do not have the required permissions to view this forum!', 'wp-bb'); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    } else {
+        $edit_permissions = wpbb_user_has_permission($user_id, $forum_id, 'edit');
+        if ($is_topic === true) {
+            $editing_own_topic = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $topic_id AND author = $user_id;");
+            // If user does not have edit permissions and is not editing own topic then they are trying to edit someone elses topic!
+            if (($edit_permissions === false) && (!$editing_own_topic)) {
+                wpbb_goback1('edit-other-topic-denied', NULL);
+// Display a "Go back" link
+wpbb_goback1();
+$is_post = isset($_GET['post']) ? true : false;
+$forum_id = absint($_GET['forum']);
+$user_id = get_current_user_id();
+$topic_id = absint($_GET['topic']);
+if (isset($_GET['post'])) {
+    $post_id = absint($_GET['post']);
+}
+$view_permissions = wpbb_user_has_permission($user_id, $forum_id);
+if ($view_permissions === false) {
+    ?>
+    <div class="wpbb-message-failure">
+        <?php _e('You do not have the required permissions to view this forum!', 'wp-bb'); ?>
+    </div>
+    <?php
+    wpbb_exit();
+} else {
+    $edit_permissions = wpbb_user_has_permission($user_id, $forum_id, 'edit');
+    if ($is_post === false) {
+        $editing_own_topic = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $topic_id AND author = $user_id;");
+        // If user does not have edit permissions and is not editing own topic then they are trying to edit someone elses topic!
+        if (($edit_permissions === false) && (!$editing_own_topic)) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You do not have the required permissions to edit other peoples topics in this forum!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    } else if ($is_post === true) {
+        $editing_own_post = $wpdb->get_var("SELECT id FROM ".POST_TABLE." WHERE id = $post_id AND author = $user_id;");
+        // If user does not have edit permissions and is not editing own post then they are trying to edit someone elses topic!
+        if (($edit_permissions === false) && (!$editing_own_post)) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You do not have the required permissions to edit other peoples posts in this forum!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
+}
+if ($is_post === false) {
+    // Form submission
+    if (isset($_POST['wpbbtopiceditsubmit'])) {
+        if (empty($_POST['wpbbtopiccontent']) || empty($_POST['wpbbtopicname'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must enter a title and some content for your topic', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        // Sanitize topic title
+        $topic_name = wp_strip_all_tags($_POST['wpbbtopicname']);
+        if (is_numeric($_POST['wpbbauthorname'])) { // ID supplied
+            $topic_author = absint($_POST['wpbbauthorname']);
+        } else if (is_string($_POST['wpbbauthorname'])) { // Name supplied
+            $topic_author_name = wp_strip_all_tags($_POST['wpbbauthorname']);
+            $topic_author = wpbb_parse_author_name(NULL, $topic_author_name);
+        }
+        $topic_content = wpbb_strip_tags($_POST['wpbbtopiccontent']);
+        if (($_POST['wpbbtopicforum'] == 'yes') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+            $topic_forum = absint($_POST['wpbbtopicforumname']);
+            // Check category exists otherwise do not allow submission to proceed
+            $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_forum;");
+            if ($exists === false) {
                 ?>
                 <div class="wpbb-message-failure">
                     <?php _e('You do not have the required permissions to edit other peoples topics in this forum!', 'wp-bb'); ?>
+                    <?php _e('That category does not exist. Please make sure you choose a valid category.', 'wp-bb'); ?>
                 </div>
                 <?php
                 wpbb_exit();
+            }
+        } else if ($is_post === true) {
+            $editing_own_post = $wpdb->get_var("SELECT id FROM ".POST_TABLE." WHERE id = $post_id AND author = $user_id;");
+            // If user does not have edit permissions and is not editing own post then they are trying to edit someone elses topic!
+            if (($edit_permissions === false) && (!$editing_own_post)) {
+                wpbb_goback1('edit-other-post-denied', NULL);
+            $topic_subforum = 0;
+        } else if (($_POST['wpbbtopicsubforum'] == 'yes') && ($_POST['wpbbtopicforum'] == 'no')) {
+            $topic_subforum = absint($_POST['wpbbtopicsubforumname']);
+            // Check forum exists otherwise do not allow submission to proceed
+            $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_subforum;");
+            if ($exists === false) {
                 ?>
                 <div class="wpbb-message-failure">
                     <?php _e('You do not have the required permissions to edit other peoples posts in this forum!', 'wp-bb'); ?>
+                    <?php _e('That forum does not exist. Please make sure you choose a valid forum.', 'wp-bb'); ?>
                 </div>
                 <?php
                 wpbb_exit();
+            }
+        }
+    }
+    //if (isset($_GET['topic']) && (!isset($_GET['post']))) { // It's a topic
+    if ($is_topic === true) {
+        // Form submission
+        if (isset($_POST['wpbbtopiceditsubmit'])) {
+            if (empty($_POST['wpbbtopiccontent']) || empty($_POST['wpbbtopicname'])) {
+                wpbb_goback1('edit-topic-submit-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must enter a title and some content for your topic', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            // Sanitize topic title
+            $topic_name = wp_strip_all_tags($_POST['wpbbtopicname']);
+            // Sanitize author name
+            $topic_author_name = wp_strip_all_tags($_POST['wpbbauthorname']);
+            // Get ID back from the sanitized author name
+            $topic_author = wpbb_parse_author_name(NULL, $topic_author_name);
+            $topic_content = wpbb_strip_tags($_POST['wpbbtopiccontent']);
+            if (($_POST['wpbbtopicforum'] == 'yes') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+                $topic_forum = absint($_POST['wpbbtopicforumname']);
+                // Check category exists otherwise do not allow submission to proceed
+                $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_forum;");
+                if ($exists === false) {
+                    wpbb_goback1('edit-topic-cat-exists-error', NULL);
+                    ?>
+                    <div class="wpbb-message-failure">
+                        <?php _e('That category does not exist. Please make sure you choose a valid category.', 'wp-bb'); ?>
+                    </div>
+                    <?php
+                    wpbb_exit();
+                }
+                $topic_subforum = 0;
+            } else if (($_POST['wpbbtopicsubforum'] == 'yes') && ($_POST['wpbbtopicforum'] == 'no')) {
+                $topic_subforum = absint($_POST['wpbbtopicsubforumname']);
+                // Check forum exists otherwise do not allow submission to proceed
+                $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_subforum;");
+                if ($exists === false) {
+                    wpbb_goback1('edit-topic-forum-exists-error', NULL);
+                    ?>
+                    <div class="wpbb-message-failure">
+                        <?php _e('That forum does not exist. Please make sure you choose a valid forum.', 'wp-bb'); ?>
+                    </div>
+                    <?php
+                    wpbb_exit();
+                }
+                $topic_forum = 0;
+            } else if (($_POST['wpbbtopicforum'] == 'no') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+                wpbb_goback1('edit-topic-select-cat-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must select a category or forum for the topic to be posted in.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            if (isset($_POST['wpbbtopicstatus'])) {
+                $topic_status = implode(",", (array) $_POST['wpbbtopicstatus']);
+            } else {
+                $topic_status = "";
+            }
+            $data = array(
+                'name' => $topic_name,
+                'author' => $topic_author,
+                'content' => $topic_content,
+                'forum' => $topic_forum,
+                'subforum' => $topic_subforum,
+                'status' => $topic_status
+            );
+            $save_topic = $wpdb->update(TOPIC_TABLE, $data, array('id' => $topic_id));
+            if ($save_topic !== false) {
+                wpbb_goback1('edit-topic-success', NULL);
+                ?>
+                <div class="wpbb-message-success">
+                    <?php printf(__('Topic ID %s edited successfully'), $topic_id); ?>
+                </div>
+                <?php
+            } else {
+                wpbb_goback1('edit-topic-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php printf(__('There was an error editing topic ID %s'), $topic_id); ?>
+                </div>
+                <?php
+            }
+        }
+        // End Form Submission
+        $get_topic = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE id = $topic_id;");
+        if ($get_topic !== false) {
+            ?>
+            <table class="wpbb-table">
+                <form method='POST' action='#'>
+            <?php
+            foreach ($get_topic as $topic) {
+                if (strpos($topic->status, 'locked') !== false) $locked = true; else $locked = false;
+                if (strpos($topic->status, 'sticky') !== false) $sticky = true; else $sticky = false;
+                if (strpos($topic->status, 'poll') !== false) $poll = true; else $poll = false;
+                $topic_author_name = wpbb_parse_author_name($topic->author);
+                ?>
+                <tr>
+                    <th><?php _e('Name', 'wp-bb'); ?></th>
+                    <td>
+                        <input name='wpbbtopicname' maxlength='45' size='25' value='<?php echo $topic->name; ?>' />
+                    </td>
+                </tr>
+                <?php
+                if (current_user_can('manage_options')) {
+            $topic_forum = 0;
+        } else if (($_POST['wpbbtopicforum'] == 'no') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must select a category or forum for the topic to be posted in.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        if (isset($_POST['wpbbtopicstatus'])) {
+            $topic_status = implode(",", (array) $_POST['wpbbtopicstatus']);
+        } else {
+            $topic_status = "";
+        }
+        $data = array(
+            'name' => $topic_name,
+            'author' => $topic_author,
+            'content' => $topic_content,
+            'forum' => $topic_forum,
+            'subforum' => $topic_subforum,
+            'status' => $topic_status
+        );
+        $save_topic = $wpdb->update(TOPIC_TABLE, $data, array('id' => $topic_id));
+        if ($save_topic !== false) {
+            ?>
+            <div class="wpbb-message-success">
+                <?php printf(__('Topic ID %s edited successfully'), $topic_id); ?>
+            </div>
+            <?php
+        } else {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php printf(__('There was an error editing topic ID %s'), $topic_id); ?>
+            </div>
+            <?php
+        }
+    }
+    // End Form Submission
+    $get_topic = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE id = $topic_id;");
+    if ($get_topic !== false) {
+        ?>
+        <table class="wpbb-table">
+            <form method='POST' action='#'>
+                <?php
+                foreach ($get_topic as $topic) {
+                    $sticky = (strpos($topic->status, 'sticky') !== false) ? true : false;
+                    $locked = (strpos($topic->status, 'locked') !== false) ? true : false;
+                    $topic_author_name = wpbb_parse_author_name($topic->author);
                     ?>
                     <tr>
+                        <th><?php _e('Name', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbtopicname' maxlength='45' size='25' value='<?php echo $topic->name; ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                    if (current_user_can('manage_options')) {
+                        ?>
+                        <tr>
                         <th><?php _e('Author', 'wp-bb'); ?></th>
                         <td>
 …
                     <?php
+                }
+                if ($topic->forum > 0) $is_forum = true; else $is_forum = false;
+                if ($topic->subforum > 0) $is_subforum = true; else $is_subforum = false;
+                $is_forum = ($topic->forum > 0) ? true: false;
+                $is_subforum = ($topic->subforum > 0) ? true : false;
                 // Forums
                 ?>
 …
                     <th><?php _e('Status', 'wp-bb'); ?></th>
                     <td>
                         <input type='checkbox' name='wpbbtopicstatus[]' value='locked' ".checked($locked, true, false)."/> <?php _e('Locked', 'wp-bb'); ?>
                         <input type='checkbox' name='wpbbtopicstatus[]' value='sticky' ".checked($sticky, true, false)."/> <?php _e('Sticky', 'wp-bb'); ?>
+                        <input type='checkbox' name='wpbbtopicstatus[]' value='locked' <?php echo checked($locked, true, false); ?>/> <?php _e('Locked', 'wp-bb'); ?>
+                        <input type='checkbox' name='wpbbtopicstatus[]' value='sticky' <?php echo checked($sticky, true, false); ?>/> <?php _e('Sticky', 'wp-bb'); ?>
                     </td>
                 <tr>
 …
         ?>
         </form>
+    </table>
+    <?php
+    } else {
+        ?>
+        <div style='text-align:center; font-color:red;'>
+            <?php printf(__('There was an error fetching topic ID %s. Please try again.'), $topic_id); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+} else if ($is_post === true) { // It's a post
+    // Post edit submission
+    if (isset($_POST['wpbbeditpostsubmit'])) {
+        $post_id = absint($_GET['post']);
+        // If a topic wasn't chosen or content wasn't entered produce an error
+        if (empty($_POST['wpbbposttopic']) || empty($_POST['wpbbpostcontent'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must choose a topic for the post and content must not be empty!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        if (is_numeric($_POST['wpbbpostauthor'])) {
+            // Strip all tags from the authors name
+            $post_author_name = wp_strip_all_tags($_POST['wpbbpostauthor']);
+            // Retrieve ID back from username
+            $post_author = wpbb_parse_author_name(NULL, $post_author_name);
+        } else {
+            $post_author = absnt($_POST['wpbbpostauthor']);
+        }
+        $post_content = wpbb_strip_tags($_POST['wpbbpostcontent']);
+        $post_topic = absint($_POST['wpbbposttopic']);
+        $data = array(
+            'author' => $post_author,
+            'topic' => $post_topic,
+            'text' => $post_content
+        );
+        $update_post = $wpdb->update(POST_TABLE, $data, array('id' => $post_id));
+        $wpdb->show_errors();
+        if ($update_post === false) { // Db error
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error attempting to save your post, please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+        } else { // Success
+            ?>
+            <div class="wpbb-message-success">
+                <?php _e('Thankyou, your post has been saved successfully', 'wp-bb'); ?>
+            </div>
+            <?php
+        }
+    }
+    // End post edit submission
+    // Attempt to retrieve the post from the db
+    $get_post = $wpdb->get_results("SELECT * FROM ".POST_TABLE." WHERE id = $post_id;");
+    // If there wasn't an error...
+    if ($get_post !== false) {
+        ?>
+        <table class="wpbb-table">
+            <form method='POST' action='#'>
+                <?php
+                foreach ($get_post as $post) {
+                $post_author_name = wpbb_parse_author_name($post->author);
+                if (current_user_can('manage_options')) {
+                    ?>
+                    <tr>
+                        <th><?php _e('Author', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                } else {
+                    ?>
+                    <tr>
+                        <th><?php _e('Author', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' disabled='disabled' />
+                        </td>
+                    </tr>
+                    <?php
+                }
+                ?>
+                <tr>
+                    <th><?php _e('Topic', 'wp-bb'); ?></th>
+                    <td>
+                        <input name='wpbbposttopic' maxlength='45' size='24' value='<?php echo $post->topic; ?>' />
+                    </td>
+                </tr>
+                <tr>
+                    <th><?php _e('Content', 'wp-bb'); ?></th>
+                    <td>
+                        <?php wp_editor($post->text, 'wpbbpostcontent'); ?>
+                    </td>
+                </tr>
+                <tr>
+                    <th></th>
+                    <td>
+                        <input type='submit' name='wpbbeditpostsubmit' value='<?php _e('Save Changes', 'wp-bb'); ?>' />
+                    </td>
+                </tr>
+                <?php
+            }
+            ?>
+            </form>
         </table>
         <?php
+        } else {
+            wpbb_goback1('edit-get-topic-error', NULL);
+            ?>
+            <div style='text-align:center; font-color:red;'>
+                <?php printf(__('There was an error fetching topic ID %s. Please try again.'), $topic_id); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    } else if ($is_post === true) { // It's a post
+        // Post edit submission
+        if (isset($_POST['wpbbeditpostsubmit'])) {
+            $post_id = absint($_GET['post']);
+            // If a topic wasn't chosen or content wasn't entered produce an error
+            if (empty($_POST['wpbbposttopic']) || empty($_POST['wpbbpostcontent'])) {
+                wpbb_goback1('edit-post-empty-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must choose a topic for the post and content must not be empty!', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            // Strip all tags from the authors name
+            $post_author_name = wp_strip_all_tags($_POST['wpbbpostauthor']);
+            // Use the sanitized authors name to retrive the ID of the author to then add to the DB
+            $post_author = wpbb_parse_author_name(NULL, $post_author_name);
+            // This function uses the strip_tags function only difference being you have to edit the tags you want to skip once.
+            $post_content = wpbb_strip_tags($_POST['wpbbpostcontent']);
+            $post_topic = absint($_POST['wpbbposttopic']);
+            $data = array(
+                'author' => $post_author,
+                'topic' => $post_topic,
+                'text' => $post_content
+            );
+            $update_post = $wpdb->update(POST_TABLE, $data, array('id' => $post_id));
+            $wpdb->show_errors();
+            if ($update_post === false) { // Db error
+                wpbb_goback1('edit-post-submit-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error attempting to save your post, please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+            } else { // Success
+                wpbb_goback1('edit-post-submit-success', NULL);
+                ?>
+                <div class="wpbb-message-success">
+                    <?php _e('Thankyou, your post has been saved successfully', 'wp-bb'); ?>
+                </div>
+                <?php
+            }
+        }
+        // End post edit submission
+        // Attempt to retrieve the post from the db
+        $get_post = $wpdb->get_results("SELECT * FROM ".POST_TABLE." WHERE id = $post_id;");
+        // If there wasn't an error...
+        if ($get_post !== false) {
+            ?>
+            <table class="wpbb-table">
+                <form method='POST' action='#'>
+                    <?php
+                    foreach ($get_post as $post) {
+                    $post_author_name = wpbb_parse_author_name($post->author);
+                    if (current_user_can('manage_options')) {
+                        ?>
+                        <tr>
+                            <th><?php _e('Author', 'wp-bb'); ?></th>
+                            <td>
+                                <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' />
+                            </td>
+                        </tr>
+                        <?php
+                    } else {
+                        ?>
+                        <tr>
+                            <th><?php _e('Author', 'wp-bb'); ?></th>
+                            <td>
+                                <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' disabled='disabled' />
+                            </td>
+                        </tr>
+                        <?php
+                    }
+                    ?>
+                    <tr>
+                        <th><?php _e('Topic', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbposttopic' maxlength='45' size='24' value='<?php echo $post->topic; ?>' />
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td>
+                            <?php wp_editor($post->text, 'wpbbpostcontent'); ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbbeditpostsubmit' value='<?php _e('Save Changes', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                }
+                ?>
+                </form>
+            </table>
+            <?php
+            } else { // Error
+                wpbb_goback1('edit-post-get-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error retrieving the post. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+        }
+        } else { // Error
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error retrieving the post. Please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
 ?>

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

-                      r604652
+                      r607181
     Checks if the plugin is deactivated
 */
 // Since we're not in the admin area we must require the plugin.php file
 …
     ?>
     <div style="text-align:center;font-weight:bold;color:red;">
         <?php
+        <?php
             _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB', 'wp-bb');
             wpbb_exit();
 …
     <?php
+}
 // Load WPBB Options
 $wpbb_options = get_option('wpbb_options');
 …
     && (!isset($_GET['method']))
     && (!isset($_GET['state']))) {
+    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+        require_once('facebook/wpbb-facebook.php');
+    }
+    require_once('wpbb-functions.php');
     ?>
     <div class="wpbb-centered-bold">
         <?php
             printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register'));
+            wpbb_is_user_logged_in();
         ?>
     </div>
     <?php
-    // Load facebook functionality if facebook is enabled
-    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
-        require_once('facebook/wpbb-facebook.php');
+    }
-    exit();
+}
 …
     if (current_user_can('manage_options')) {
         ?>
         <div id="wpbb-admin-maintenance-reminder">
+        <div class="wpbb-message-warning">
         <?php _e('The board is currently in maintenance mode. To turn it off change Maintenance Mode in Settings -> WPBB Settings to "Off"', 'wp-bb'); ?>
         </div>
 …
     } else {
         ?>
         <div id="wpbb-maintenance-message">
+        <div class="wpbb-message-warning">
             <?php echo $wpbb_options['maintenance_message']; ?>
         </div>
         <?php
+        if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+            require_once('facebook/wpbb-facebook.php');
+        }
+        require_once('wpbb-functions.php');
+        wpbb_footer();
         wpbb_exit();
+    }
+}
+// Simple snippet to disallow any unrecognized get key/values
+$allowed_get_values = array(
+    'forum',
+    'subforum',
+    'topic',
+    'post',
+    'current_page',
+    'action',
+    'create',
+    'profile',
+    'unread_topics',
+    'unanswered_topics',
+    'message',
+    'messages',
+    'view',
+    'code',
+    'state',
+    'register',
+    'method',
+    'login',
+    'delete_msg',
+    'page_id'
+);
+foreach ($_GET as $get => $value) {
+    if (!in_array($get, $allowed_get_values)) {
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php _e('Sorry the page you requested could not be found. Please try again.', 'wp-bb'); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+}
+/*
+    Loads all functions
+*/
+require_once('wpbb-functions.php');
+/*
+    Checks a page supplied exists
+*/
+wpbb_page_exists();
 /*
 …
+}
 /*
     Twitter
 …
+}
-/*
-    Load all Functions
-*/
-require_once('wpbb-functions.php');
 …
+    }
+    /*
+        Viewing All Messages (& Delete)
+    /*
+        Viewing All Messages
     */
     if ((isset($_GET['messages']))
         && (isset($_GET['page_id']))
         && (isset($_GET['current_page']))
         && ($_GET['messages'] == 'all')) {
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 3)) {
         require_once('wpbb-all-messages.php');
+    }
+    /*
+        Deleting a message
+    */
+    if ((isset($_GET['messages']) && $_GET['messages'] == 'all')
+        && (isset($_GET['delete_msg']))
+        && (isset($_GET['page_id']))
+        && (count($_GET) > 1 && count($_GET) <= 3)) {
+        require_once('wpbb-delete-message.php');
+    }
 …
     /*
+        Viewing All Messages (& Delete)
+    */
+        Viewing All Messages
+    */
+    if ((isset($_GET['messages']))
+        && ($_GET['messages'] == 'all')
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 2 || count($_GET) == 3)) {
+        require_once('wpbb-all-messages.php');
+    }
+    /*
+        Deleting a message
+    */
     if ((isset($_GET['messages']))
         && ($_GET['messages'] == 'all')
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 2)) {
+        require_once('wpbb-all-messages.php');
+    }
+        && (isset($_GET['delete_msg']))
+        && (count($_GET) > 1 && count($_GET) <= 2)) {
+        require_once('wpbb-delete-message.php');
+    }
     /*
         Viewing Individual Message
 …
     if ((isset($_GET['messages']))
         && ($_GET['messages'] == 'all')
         && ((isset($_GET['view'])) && ($_GET['view']))
         && (count($_GET) == 2)) {
+        && ((isset($_GET['view']))
+        && (count($_GET) == 2))) {
         require_once('wpbb-view-message.php');
+    }
 …
+}
+// Displays the wpbb powered by footer if it is enabled
+if ($wpbb_options['show_footer'] == 'yes') {
+    ?>
+    <div class="wpbb-forum-footer">
+        Powered by <a href="<?php echo WPBB_PLUGIN_URL; ?>">WPBB</a> <?php if (isset($wpbb_options['version'])) echo $wpbb_options['version']; ?>
+    </div>
+    <?php
+}
+wpbb_footer();
 ?>

wp-bulletin-board/tags/1.0.2/php/wpbb-functions.php

-                      r604652
+                      r607181
+ *
+ *
  * @since 1.0.1
+ * @since 1.0.2
+ *
  * @param    int        $forum_id       The ID of the forum
 …
     $forum_id = isset($_GET['forum']) ? $_GET['forum'] : NULL;
     $subforum_id = isset($_GET['subforum']) ? $_GET['subforum'] : NULL;
+    $topic_id = isset($_GET['topic']) ? $_GET['topic'] : NULL;
     $query_args = array('forum' => $forum_id, 'subforum' => $subforum_id, 'topic' => $topic_id, 'current_page' => 1);
     $count = array();
 …
+    }
     switch ($where) {
+        case 'forum-index':
+        ?>
+        <div class="wpbb-centered-bold">
+            <a href="<?php echo $permalink; ?>">Go back</a>
+        </div>
+        <?php
+        break;
         default:
         ?>
 …
     if (empty($user_roles)) {
+        wpbb_goback1('forum-index', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
+}
+/**
+ * WPBB version of is_user_logged_in(). Displays error message or returns user ID
+ *
+ * Displays a login/register (wordpress/facebook) message if no user ID is found otherwise returns the user ID
+ *
+ * @since 1.0.2
+ *
+ * @return  int  $user_id   Returns the user ID if the current user is logged in
+ *
+ */
+function wpbb_is_user_logged_in() {
+    $options = get_option('wpbb_options');
+    $facebook_options = get_option('wpbb_facebook_options');
+    $user_id = get_current_user_id();
+    if ($user_id === NULL || $user_id === 0) {
+        if ($facebook_options['allow_facebook'] == 'yes') {
+            $facebook_register_url = add_query_arg(array('register' => '', 'method' => 'facebook'), wpbb_permalink());
+            $facebook_login_url = wpbb_get_facebook_login();
+            ?>
+            <div class="wpbb-centered-bold">
+                <a href="<?php echo $facebook_login_url; ?>"><?php _e('Login using Facebook', 'wp-bb'); ?></a>
+                <?php _e('or', 'wp-bb'); ?>
+                <a href="<?php echo $facebook_register_url; ?>"><?php _e('Register using Facebook', 'wp-bb'); ?></a>
+            </div>
+            <?php
+        }
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register')); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    } else {
+        return $user_id;
+    }
+}
+/**
+ * Checks whether a forum, subforum or topic exists depending on arguments provided
+ *
+ *
+ * @since 1.0.2
+ *
+ * @param   string  $what       Must be one of three: 'forum', 'subforum' or 'topic' - refers to what you are checking exists. Default is forum.
+ * @param   int     $what_id    Must be set and an integer otherwise won't return anything
+ * @return  int     $user_id    Returns the user ID if the current user is logged in
+ *
+ */
+function wpbb_check_exists($what = 'forum', $what_id) {
+    if ((isset($what)) && (is_numeric($what_id))) {
+        global $wpdb;
+        if ($what == 'topic') {
+            $topic_exists = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $what_id;");
+            if ($topic_exists === NULL) {
+                wpbb_goback1('forum-index');
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('Sorry, that topic doesn\'t exist. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+        } else if ($what == 'forum' || $what == 'subforum') {
+            $exists = $wpdb->get_var("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $what_id;");
+            if ($exists === NULL) {
+                wpbb_goback1();
+                $type = ($what == 'subforum') ? 'subforum' : 'forum';
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('Sorry, that '.$type.' doesn\'t exist. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit('forum-index');
+            }
+        }
+    }
+}
+/**
+ * Displays the WPBB powered by footer if it is enabled in settings
+ *
+ *
+ * @since 1.0.2
+ *
+ *
+ */
+function wpbb_footer() {
+    $options = get_option('wpbb_options');
+    if ($options['show_footer'] == 'yes') {
+        ?>
+        <div class="wpbb-forum-footer">
+            <p>Powered by <a href="<?php echo WPBB_PLUGIN_URL; ?>">WPBB</a> <?php echo WPBB_VERSION; ?></p>
+        </div>
+        <?php
+    }
+}
+/**
+ * Checks whether the $_GET key/value pair(s) (page) exists
+ *
+ *
+ * @since 1.0.2
+ *
+ *
+ */
+function wpbb_page_exists() {
+    $allowed_get_values = array(
+        'forum', 'subforum', 'topic', 'post', 'current_page', 'action', 'create',
+        'profile', 'unread_topics', 'unanswered_topics',
+        'message', 'messages', 'view', 'delete_msg',
+        'code', 'state', 'register', 'method', 'login',
+        'page_id'
+    );
+    foreach ($_GET as $get => $value) {
+        if (!in_array($get, $allowed_get_values)) {
+            wpbb_goback1();
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('Sorry the page you requested could not be found. Please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
+}
 ?>

wp-bulletin-board/tags/1.0.2/php/wpbb-index.php

-                      r604652
+                      r607181
 $user_id = get_current_user_id();
 if (isset($_POST['wpbb-search-submit'])) {
+    wpbb_goback1('search_results', NULL);
+    if (!$user_id) {
+        wpbb_is_user_logged_in();
+        wpbb_exit();
+    }
     $search_criteria = wp_strip_all_tags($_POST['wpbb-search']);
 …
     if ($wpdb->num_rows === 0) {
+        wpbb_goback1('search-results', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
             $delete_topic_link = sprintf(__('<a href="%s">Delete</a>'), add_query_arg(array('forum' => $found->forum, 'topic' => $found->id, 'action' => 'delete'), get_permalink()));
             $status = wpbb_get_topic_status_buttons($topic->status);
+            $status = wpbb_get_topic_status_buttons($found->status);
             ?>
 …
     ?>
     <p class="wpbb-centered">
         <a href='<?php echo add_query_arg(array('profile' => $user_id), wpbb_permalink()); ?>'><?php _e('My Profile', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('unread_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unread Topics', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('unanswered_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unanswered Topics', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('messages' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('My Messages', 'wp-bb'); ?></a>
+        <a href='<?php echo add_query_arg(array('profile' => $user_id), wpbb_permalink()); ?>'><?php _e('My Profile', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('unread_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unread Topics', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('unanswered_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unanswered Topics', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('messages' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('My Messages', 'wp-bb'); ?></a>
     </p>
 …
     // Grab all categories from the database
     $categories = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE forum = 0 AND subforum = 0 ORDER BY `order`;");
+    $categories = $wpdb->get_results("SELECT `id`, `name`, `order` FROM ".CATEGORIES_TABLE." WHERE forum = 0 AND subforum = 0 ORDER BY `order`;");
     if ($categories) {
         // Create our table
 …
             <?php
             // Grab all forums which belong to the current category
             $forums = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE forum = $category->id ORDER BY `order`;");
+            $forums = $wpdb->get_results("SELECT `id`, `name`, `description`, `order` FROM ".CATEGORIES_TABLE." WHERE forum = $category->id ORDER BY `order`;");
             if (!$forums) {
                 ?> <tr><td></td><td></td><td></td><td></td></tr><?php
 …
                         // Grab all subforums which belong to the current forum
                         if ($options['allow_subforums'] == 'yes') {
                             $subforums = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE subforum = $forum->id ORDER BY `order`;");
+                            $subforums = $wpdb->get_results("SELECT `id`, `name`, `description`, `order` FROM ".CATEGORIES_TABLE." WHERE subforum = $forum->id ORDER BY `order`;");
                             if ($subforums) {
                                 _e('Subforums: ', 'wp-bb');

wp-bulletin-board/tags/1.0.2/php/wpbb-message-user.php

-                      r604862
+                      r607181
 <?php
 wpbb_goback1('message-user', NULL);
+wpbb_goback1();
 if ((isset($_GET['message']))
     && (count($_GET) === 1)) {
     if (isset($_POST['wpbb-message-submit'])) {
         if (isset($_POST['wpbb-message-to'])) {
             $to_name_stripped = wp_strip_all_tags($_POST['wpbb-message-to']);
             $to_id = wpbb_parse_author_name(NULL, $to_name_stripped);
+if (isset($_POST['wpbb-message-submit'])) {
+    if (isset($_POST['wpbb-message-to'])) {
+        if (is_numeric($_POST['wpbb-message-to'])) {
+            $to_id = absint($_POST['wpbb-message-to']);
+            $to_name = wpbb_parse_author_name($to_id);
+        } else {
+            $to_name = wp_strip_all_tags($_POST['wpbb-message-to']);
+            $to_id = wpbb_parse_author_name(NULL, $to_name);
+        }
             $check_id_exists = get_user_by('id', $to_id);
+        $check_id_exists = get_user_by('id', $to_id);
+            if ($check_id_exists === false) {
+        if ($check_id_exists === false) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
                 _e("Sorry, that user doesn't exist. Please try again", "wp-bb");
+                exit();
+            }
+                ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+            $from = get_current_user_id();
+            // Stops an empty title from being submitted which isn't openable by the recipient without manually modifying the URL
+            /**
+            * @todo ... 1. Allow blank subjects, perhaps replacing it with another character. 2. Delay between messages
+            */
+            if (empty($_POST['wpbb-message-subject'])) {
+                _e("You must enter a subject for your message", "wp-bb");
+                exit();
+            } else {
+                $subject = wp_strip_all_tags($_POST['wpbb-message-subject']);
+            }
+            $content = wpbb_strip_tags($_POST['wpbb-message-content']);
+            $sent = date("Y-m-d H:i:s");
+            $data = array('to' => $to_id, 'from' => $from, 'subject' => $subject, 'content' => $content, 'sent' => $sent);
+            $send_message = $wpdb->insert(MESSAGES_TABLE, $data);
+            if ($send_message === false) {
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error sending the message. Please try again', 'wp-bb'); ?>
+                </div>
+                <?php
+            } else {
+                ?>
+                <div class="wpbb-message-success">
+                    <?php printf(__('Message to %s (%s) sent successfully.'), $to_name_stripped, $to_id); ?>
+                </div>
+                <?php
+            }
+        $from = get_current_user_id();
+        if (empty($_POST['wpbb-message-subject'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e("You must enter a subject for your message", "wp-bb"); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        } else {
+            $subject = wp_strip_all_tags($_POST['wpbb-message-subject']);
+        }
+        $content = wpbb_strip_tags($_POST['wpbb-message-content']);
+        $sent = date("Y-m-d H:i:s");
+        $data = array('to' => $to_id, 'from' => $from, 'subject' => $subject, 'content' => $content, 'sent' => $sent);
+        $send_message = $wpdb->insert(MESSAGES_TABLE, $data);
+        if ($send_message === false) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error sending the message. Please try again', 'wp-bb'); ?>
+            </div>
+            <?php
+        } else {
+            ?>
+            <div class="wpbb-message-success">
+                <?php printf(__('Message to %s (%s) sent successfully.'), $to_name, $to_id); ?>
+            </div>
+            <?php
+        }
+    }
+}
+$message_id = absint($_GET['message']);
+if ($message_id != 'to') {
     $message_id = absint($_GET['message']);
+}
+?> <h2 class="wpbb-centered-bold"><?php _e('Compose Message', 'wp-bb'); ?></h2> <?php
+    if ($message_id != 'to') {
+$message_username = wpbb_parse_author_name($message_id);
-        $message_id = absint($_GET['message']);
+    }
-    ?> <h2 class="wpbb-centered-bold"><?php _e('Compose Message', 'wp-bb'); ?></h2> <?php
-    $message_username = wpbb_parse_author_name($message_id);
-    ?>
-    <table class="wpbb-table">
-        <form method='POST' action='#'>
-            <tr>
-                <th><?php _e('To', 'wp-bb'); ?></th>
-                <td>
-                    <input type='text' name='wpbb-message-to' value='<?php echo $message_username; ?>' />
-                </td>
-            </tr>
-            <tr>
-                <th><?php _e('Subject', 'wp-bb'); ?></th>
-                <td>
-                    <input type='text' name='wpbb-message-subject' value='' />
-                </td>
-            </tr>
-            <tr>
-                <th><?php _e('Content', 'wp-bb'); ?></th>
-                <td>
-                     <?php wp_editor(" ", 'wpbb-message-content'); ?>
-                </td>
-            </tr>
-            <tr>
-                <th></th>
-                <td>
-                    <input type='submit' name='wpbb-message-submit' value='<?php _e('Send Message', 'wp-bb'); ?>' />
-                </td>
-            </tr>
-        </form>
-    </table>
-    <?php
+}
 ?>
+<table class="wpbb-table">
+    <form method='POST' action='#'>
+        <tr>
+            <th><?php _e('To', 'wp-bb'); ?></th>
+            <td>
+                <input type='text' name='wpbb-message-to' value='<?php echo $message_username; ?>' />
+            </td>
+        </tr>
+        <tr>
+            <th><?php _e('Subject', 'wp-bb'); ?></th>
+            <td>
+                <input type='text' name='wpbb-message-subject' value='' />
+            </td>
+        </tr>
+        <tr>
+            <th><?php _e('Content', 'wp-bb'); ?></th>
+            <td>
+                    <?php wp_editor("", 'wpbb-message-content'); ?>
+            </td>
+        </tr>
+        <tr>
+            <th></th>
+            <td>
+                <input type='submit' name='wpbb-message-submit' value='<?php _e('Send Message', 'wp-bb'); ?>' />
+            </td>
+        </tr>
+    </form>
+</table>
+<?php
+?>

wp-bulletin-board/tags/1.0.2/php/wpbb-reply-topic.php

-                      r604652
+                      r607181
 <?php
+$user_id = get_current_user_id();
+$user_id = get_current_user_id();
 $subforum = false;
 $subforum_id = NULL;
+wpbb_goback1('reply-topic', NULL);
 …
 $topic_id = absint($_GET['topic']);
+wpbb_goback($forum_id, $subforum_id, $topic_id);
 // Check forum permissions

wp-bulletin-board/tags/1.0.2/php/wpbb-unanswered-topics.php

-                      r604652
+                      r607181
 <?php
+    wpbb_goback1('unanswered_topics', NULL);
+    $user_id = get_current_user_id();
+    $user_id = wpbb_is_user_logged_in();
-    if ($user_id != 0) {
     $options = get_option('wpbb_options');
     $topics_per_page = $options['topics_per_page'];
 …
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE created = last_reply;");
     $topics = false;
     if ($total_topics > 0) {
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
         wpbb_pagination(NULL, $current_page, $start, $limit, $total_topics, $topics_per_page);
+        $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE created = last_reply ORDER by created DESC LIMIT $start, $limit;");
+    } else {
         $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE created = last_reply ORDER by created DESC LIMIT $start, $limit;");
+    }
     if ($topics) {
+        wpbb_goback1('unanswered_topics', NULL);
         ?>
         <h3 class="wpbb-centered-bold"><?php _e('Unanswered Topics', 'wp-bb'); ?></h3>
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold"><?php _e('Unanswered Topics', 'wp-bb'); ?></h1>
         <table class="wpbb-table">
             <th><?php _e('Status', 'wp-bb'); ?></th>
 …
             ?> </table> <?php
         } else {
+            wpbb_goback1('unanswered_topics', NULL);
             ?>
             <div class="wpbb-centered-bold">
+            <div class="wpbb-message-failure">
                 <?php _e('There are no unanswered topics at this time.', 'wp-bb'); ?>
             </div>
 …
+        }
-        } else {
-            ?>
-            <div class="wpbb-centered-bold">
-                <?php _e('Please register or login to view this page', 'wp-bb'); ?>
-            </div>
-            <?php
+        }
 ?>

wp-bulletin-board/tags/1.0.2/php/wpbb-unread-topics.php

-                      r604652
+                      r607181
 <?php
-    // Display go back link
-     wpbb_goback1('unread-topics', NULL);
      // Returns user ID
      $user_id = get_current_user_id();
+     $user_id = wpbb_is_user_logged_in();
-     if ($user_id != 0) {
         $user_lastvisit = get_user_meta($user_id, 'wpbb_lastvisit', true);
 …
+            }
+        }
         $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE last_reply = '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0;");
+        $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0;");
         $topics = false;
         if ($total_topics > 0) {
+        if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
             wpbb_pagination(NULL, $current_page, $start, $limit, $total_topics, $topics_per_page);
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply = '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+        } else {
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+        }
         if ($topics) {
+            wpbb_goback1('unread-topics', NULL);
             ?>
             <h3 class="wpbb-centered-bold">
+            <h1 id="wpbb-h-1" class="wpbb-centered-bold">
                 <?php _e('Unread Topics Since Last Visit', 'wp-bb'); ?>
             </h3>
+            </h1>
             <table class="wpbb-table">
                 <th><?php _e('Status', 'wp-bb'); ?></th>
 …
                     $status = wpbb_get_topic_status_buttons($topic->status);
+                    $freshness = wpbb_get_topic_freshness($topic_last_post);
                     ?>
 …
                         <td>
+                            <?php
+                            <?php
+                            echo $freshness;
                             if ($status['locked'] != "") {
                                 echo $status['locked'];
 …
             <?php
         } else {
+            wpbb_goback1('unread-topics', NULL);
             ?>
             <div class="wpbb-centered-bold">
+            <div class="wpbb-message-failure">
                 <?php _e('There are no unread topics at this time', 'wp-bb'); ?>
             </div>
 …
+        }
+    } else {
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php _e('Please register or login to view this page', 'wp-bb'); ?>
+        </div>
+        <?php
+    }
 ?>

wp-bulletin-board/tags/1.0.2/php/wpbb-view-forum-topic.php

-                      r604652
+                      r607181
 <?php
+    $topic_id = absint($_GET['topic']);
+    wpbb_check_exists('topic', $topic_id);
     $user_id = get_current_user_id();
     $forum = absint($_GET['forum']);
 …
+    }
     $topic_id = absint($_GET['topic']);
     $topic_status = wpbb_get_topic_status($topic_id);
 …
             $topic_id = absint($_GET['topic']);
             $total_posts = $wpdb->get_var("SELECT COUNT(*) as 'Posts' FROM ".POST_TABLE." WHERE topic = $topic->id;");
+            wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+            if (($total_posts > 0) && ($total_posts > $posts_per_page)) {
+                wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+            }
             wpbb_buttons($forum, NULL, $topic_id, 'forum_topic');
             $user_posts = get_user_meta($topic->author, 'wpbb_posts', true);
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature">
                                 <?php echo $signature; ?>
+                                <?php echo convert_smilies($signature); ?>
                             </p>
                         </td>
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature"</p>
                             <?php echo $signature; ?>
+                            <?php echo convert_smilies($signature); ?>
                         </td>
                     </tr>
 …
             <div class="wpbb-quick-reply">
                 <form action='#' method='POST'>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td><textarea name='wpbb-quick-reply-content'></textarea></td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <div>
+                        <?php _e('Content', 'wp-bb'); ?>
+                    </div>
+                    <div>
+                        <textarea name='wpbb-quick-reply-content'></textarea>
+                    </div>
+                    <div>
+                        <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                    </div>
                 </form>
             </div>

wp-bulletin-board/tags/1.0.2/php/wpbb-view-forum.php

-                      r604652
+                      r607181
     $forum = absint($_GET['forum']);
+    wpbb_check_exists('forum', $forum);
     $user_id = get_current_user_id();
 …
     $view_permissions = wpbb_user_has_permission($user_id, $forum);
     if ($view_permissions === false) {
         wpbb_goback1('forum_denied', NULL);
+        wpbb_goback1('forum-index', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE forum = $forum;");
     $topics = false;
     if ($total_topics > 0) {
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
         wpbb_pagination($forum, $current_page, $start, $limit, $total_topics, $topics_per_page);
-        $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE."  WHERE forum = $forum ORDER BY FIELD(status, 'sticky', 'locked,sticky') DESC, last_reply DESC LIMIT $start, $limit;");
+    }
+    $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE."  WHERE forum = $forum ORDER BY FIELD(status, 'sticky', 'locked,sticky') DESC, last_reply DESC LIMIT $start, $limit;");
     wpbb_buttons($forum, NULL, NULL, 'forum');
     // If 'sticky' is found in the set field, order by that first otherwise order by last_reply descending.

wp-bulletin-board/tags/1.0.2/php/wpbb-view-message.php

-                      r604862
+                      r607181
     ?>
     <table class="wpbb-table">
+    <?php
+        <th><?php _e('From', 'wp-bb'); ?></th>
+        <th><?php _e('Message', 'wp-bb'); ?></th>
+        <?php
         foreach ($get_message as $message) {
             // Mark message as read
 …
+            }
             $message_from_name = wpbb_parse_author_name($message->from);
+            $message_from_avatar = get_avatar($message->from);
+            $signature = get_user_meta($message->from, 'wpbb_signature', true);
+            $reply_to_message = "<a href=".add_query_arg(array('message' => $message->from), wpbb_permalink()).">".__('Reply', 'wp-bb')."</a>";
+            $delete_message = "<a href=".add_query_arg(array('messages' => 'all', 'delete_msg' => $message->id), wpbb_permalink()).">".__('Delete', 'wp-bb')."</a>";
             ?>
             <tr>
+                <th><?php _e('From', 'wp-bb'); ?></th>
+                <td><?php echo $message_from_name; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Sent', 'wp-bb'); ?></th>
+                <td><?php echo $message->sent; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Subject', 'wp-bb'); ?></th>
+                <td><?php echo $message->subject; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Content', 'wp-bb'); ?></th>
+                <td><?php echo $message->content; ?></td>
+                <td class="wpbb-topic-profile">
+                    <a href='<?php echo add_query_arg(array('profile' => $message->from), wpbb_permalink()); ?>'>
+                        <?php echo $message_from_name; ?>
+                    </a>
+                    <br /><?php echo $message_from_avatar; ?>
+                </td>
+                <td>
+                    <p class="wpbb-message-subject-date">
+                        <strong><?php printf(__('( Subject: %s )'), $message->subject); ?></strong>
+                        <?php echo  $message->sent . " " . $reply_to_message . " " . $delete_message; ?>
+                    </p>
+                    <p class="wpbb-topic-and-post-content">
+                        <?php echo convert_smilies($message->content); ?>
+                    </p>
+                    <hr>
+                    <p class="wpbb-topic-and-post-signature">
+                        <?php echo convert_smilies($signature); ?>
+                    </p>
+                </td>
             </tr>
             <?php

wp-bulletin-board/tags/1.0.2/php/wpbb-view-profile.php

-                      r604652
+                      r607181
 <?php
+$user_id = wpbb_is_user_logged_in();
 /*
     Viewing a Profile
 */
-    wpbb_goback1('view-profile', NULL);
     $profile_id = absint($_GET['profile']);
 …
         ?>
         <div class="wpbb-centered-bold">
             <?php _e('Please register or login to access this page', 'wp-bb'); ?>
+            <?php printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register')); ?>
         </div>
         <?php
 …
+    }
+    if ($profile_id == get_current_user_id()) {
+    wpbb_goback1();
+    if ($profile_id == $user_id) {
         ?>
         <h3 class="wpbb-centered-bold">
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold">
             <?php _e('My Profile', 'wp-bb'); ?>
         </h3>
+        </h1>
         <?php
     } else {
         ?>
         <h3 class="wpbb-centered-bold">
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold">
             <?php printf(__('Viewing %s\'s Profile'), $user->display_name); ?>
         </h3>
+        </h1>
         <?php
+    }
 …
         <div class="clear"></div>
         <table id="wpbb-profile-signature">
             <form method='POST' action='#'>
                 <th><h2><?php _e('Signature', 'wp-bb'); ?></h2></th>
                 <tr><td><textarea name='wpbb-signature'><?php echo $signature; ?></textarea></td></tr>
                 <tr><td><input type='submit' name='wpbb-signature-submit' value='<?php _e('Save Signature', 'wp-bb'); ?>' />
+        <div id="wpbb-profile-signature">
+            <form method="POST" action="#">
+                <div>
+                    <h2><?php _e('Signature', 'wp-bb'); ?></h2>
+                </div>
+                <div>
+                    <textarea name="wpbb-signature"><?php echo $signature; ?></textarea>
+                </div>
+                <div>
+                    <input type="submit" name="wpbb-signature-submit" value="<?php _e('Save Signature', 'wp-bb'); ?>" />
+                </div>
             </form>
         </table>
+        </div>
         <?php
+    }

wp-bulletin-board/tags/1.0.2/php/wpbb-view-subforum-topic.php

-                      r604652
+                      r607181
     $topic_id = absint($_GET['topic']);
+    wpbb_check_exists('topic', $topic_id);
     // Third parameter is 'view' by default
 …
                 $forum = absint($_GET['forum']);
                 $total_posts = $wpdb->get_var("SELECT COUNT(*) as 'Posts' FROM ".POST_TABLE." WHERE topic = $topic->id;");
+                wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+                if (($total_posts > 0) && ($total_posts > $posts_per_page)) {
+                    wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+                }
                 wpbb_buttons($forum, $subforum, $topic_id, 'subforum_topic');
                 if ($current_page == 1) {
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature">
                                 <?php echo $signature; ?>
+                                <?php echo convert_smilies($signature); ?>
                             </p>
                         </td>
 …
                                 <hr>
                                 <p class="wpbb-topic-and-post-signature">
                                     <?php echo $signature; ?>
+                                    <?php echo convert_smilies($signature); ?>
                                 </p>
                             </td>
 …
             <div class="wpbb-quick-reply">
                 <form action='#' method='POST'>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td><textarea name='wpbb-quick-reply-content'></textarea></td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <div>
+                        <?php _e('Content', 'wp-bb'); ?>
+                    </div>
+                    <div>
+                        <textarea name='wpbb-quick-reply-content'></textarea>
+                    </div>
+                    <div>
+                        <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                    </div>
                 </form>
             </div>

wp-bulletin-board/tags/1.0.2/php/wpbb-view-subforum.php

-                      r604652
+                      r607181
     $forum = absint($_GET['forum']);
+    $subforum = absint($_GET['subforum']);
+    wpbb_check_exists('subforum', $subforum);
     $view_permissions = wpbb_user_has_permission($user_id, $forum);
     if ($view_permissions === false) {
 …
         wpbb_exit();
     } else {
-        $subforum = absint($_GET['subforum']);
         $view_permissions = wpbb_user_has_permission($user_id, $subforum);
         if ($view_permissions === false) {
 …
+    }
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE subforum = $subforum;");
-    wpbb_pagination($subforum, $current_page, $start, $limit, $total_topics, $topics_per_page);
     wpbb_buttons($forum, $subforum, NULL, 'subforum');
+    // End of pagination
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
+        wpbb_pagination($subforum, $current_page, $start, $limit, $total_topics, $topics_per_page);
+    }
     $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE subforum = $subforum ORDER BY created DESC LIMIT $start, $limit;");
     if ($topics) {

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

-                      r604655
+                      r607181
 Requires at least: 3.3
 Tested up to: 3.4.2
 Stable tag: 1.0.1
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 1.0.2 =
+* Fixed pagination from displaying when there is only 1 page
+* Fixed being able to view or post to non-existent forums/subforums/topics
+* View message layout now resembles view topic / post layout with some adjustments
+* Ability to reply to a message from the view message page
+* Fixed smilies from not displaying correctly in topic, post, profile and messages signature
+* Signature textarea is now more consistent across different themes
+* Fixed topics status from displaying incorrectly when editing a topic
+* Facebook and Twitter are disabled by default to prevent error messages
+* Fixed compose message link under default permalinks
+* Fixed delete message link
+* Fixed inability to use ID when editing topic, post author and when composing a message.
+* Improved maintenance message and reminder styling.
+* Updated links on FAQ & Support
+* You can now choose the default role a new facebook registration has in your settings
+* Fixed registering facebook accounts if registration is disabled
 = 1.0.1 =
+* Minor bug fixes
+* Fixed broken view message link
+* Fixed table layout when a category doesn't have any forums
 * Fixed broken link in message which is displayed to logged out users
 * Fixed some layout issues due to CSS files not loading early enough, also added some css options for links and changed default visited link colour to blue

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

-                      r604665
+                      r607181
 <?php
 /*
     Plugin Name: wp-bb
     Plugin URI: http://codebycarter.com
+    Plugin Name: WPBB
+    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.1
+    Version: 1.0.2
     Author: Jay Carter
     Author URI: http://codebycarter.com
 …
 define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
 // Define current version
+define('WPBB_VERSION', 'v1.0.0');
+define('WPBB_VERSION', 'v1.0.2');
+// Define plugin url (wp plugin page)
+define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
 /*
 …
 add_action('switch_theme', 'wpbb_create_template_file');
 add_action('wp_enqueue_scripts', 'wpbb_register_styles');
+/*add_action('init', 'wpbb_setup_rewrite_rules');
+add_action('init', 'wpbb_setup_rewrite_tags');
+function wpbb_setup_rewrite_rules() {
+    add_rewrite_rule('forum(/([^\d]+))?', 'index.php/forums/?forum=$1', 'top');
+}
+function wpbb_setup_rewrite_tags() {
+    global $wp;
+    $wp->add_query_var('forum');
+}*/
+/*
+    Could've used this, overwritten _http_build_query to set the value seperator to / aswell, but its not pluggable or hookable.
+*/
+//var_dump(_http_build_query(array('forum', 'page'), null, '/', '/', false));
+function wpbb_setup_rewrite_rules() {
+    //add_rewrite_rule('carpage(/([^/]+))?(/([^/]+))?/?','index.php?pagename=carpage&var1=$matches[2]&var2=$matches[4]','top');
+}
+add_action('init', 'wpbb_setup_rewrite_rules');
 /*
 …
             'post_cutoff' => 15,
             'post_to_forum' => 'yes',
+            'show_footer' => 'no',
+            'version' => WPBB_VERSION
+            'show_footer' => 'no'
         );
         $add_wpbb_options = add_option('wpbb_options', $options);
 …
         $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' => 'yes',
+            '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_state' => $facebook_state,
+            'facebook_default_role' => $facebook_role
         );
         $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
 …
         $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
         $twitter_options = array(
             'allow_twitter' => 'yes',
+            'allow_twitter' => 'no',
             'twitter_account' => $twitter_account
         );
 …
     $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 = __('Forum', 'wp-bb');
+        $wpbb_page_title = __('Forums', 'wp-bb');
         $link = site_url().'/'.strtolower($wpbb_page_title);
         $page = array(

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

-                      r604652
+                      r607181
 /* Used for most messages */
+/* <h1> heading 1 */
+#wpbb-h-1 {
+    font-size:24px;
+}
 /* Centers text */
 .wpbb-centered {
 …
 #wpbb-search {
     float:right;
+}
-/* This is a message displayed to an admin to remind them the board is in maintenance mode */
-#wpbb-admin-maintenance-reminder {
-    text-align:center;
-    background-color: yellow;
+}
-/* This is the message displayed to users when the board is in maintenance mode (excludes admins unless logged out) */
-#wpbb-maintenance-message {
-    text-align:center;
-    font-weight:bold;
+}
 …
 /* Credit to http://css.dzone.com/news/css-message-boxes-different-me /*
 /* Layout for the success and failure messages */
 .wpbb-message-success, .wpbb-message-failure {
+.wpbb-message-success, .wpbb-message-failure, .wpbb-message-warning {
     border: 1px solid;
     margin: 10px 0px;
 …
+}
+/* Warning message background and font color */
+.wpbb-message-warning {
+    color: #9F6000;
+    background-color: #FEEFB3;
+    text-align:center;
+}
 /* The create/reply buttons when viewing a forum/subforum/topic */
 .wpbb-topic-buttons {
 …
+}
 /* The quick reply on a topic */
+/* The quick reply div at bottom of a topic */
 .wpbb-quick-reply {
     margin-left:auto;
     margin-right:auto;
-    width:50%;
     margin-bottom:100px;
     text-align:center;
+}
+/* The textarea element used for the quick reply content - determines its width/height*/
+.wpbb-quick-reply textarea {
+    min-width: 400px;
+    min-height: 100px;
+}

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

-                      r604862
+                      r607181
 /* Used for most messages */
+/* <h1> heading 1 */
+#wpbb-h-1 {
+    font-size:24px;
+}
 /* Centers text */
 .wpbb-centered {
 …
+}
-/* This is a message displayed to an admin to remind them the board is in maintenance mode */
-#wpbb-admin-maintenance-reminder {
-    text-align:center;
-    background-color: yellow;
+}
-/* This is the message displayed to users when the board is in maintenance mode (excludes admins unless logged out) */
-#wpbb-maintenance-message {
-    text-align:center;
-    font-weight:bold;
+}
 /* Defines the layout of all tables displayed on the front end */
 /* Credit to twentyelevens entry-content table as I used that as my table class when developing the plugin and and may use some styling or bare resemblance to it */
 .wpbb-table {
     width: 100%;
+    width:100%;
     border: solid 0.1em;
     border-color: #9E9E9E;
 …
     margin-left:auto;
     margin-right:auto;
+    width:50%;
+    text-align:center;
+}
+#wpbb-profile-signature textarea {
+    min-width:400px;
+    min-height:100px;
+    max-width: 400px;
+    max-height: 100px;
+}
 /* Credit to http://css.dzone.com/news/css-message-boxes-different-me /*
 /* Layout for the success and failure messages */
 .wpbb-message-success, .wpbb-message-failure {
+.wpbb-message-success, .wpbb-message-failure, .wpbb-message-warning {
     border: 1px solid;
     margin: 10px 0px;
 …
+}
+/* Warning message background and font color */
+.wpbb-message-warning {
+    color: #9F6000;
+    background-color: #FEEFB3;
+    text-align:center;
+}
 /* Search Bar */
 #wpbb-search {
 …
     margin-top:auto;
     border: 0;
     width: 80%;
+    width: auto;
+}
 …
+}
 /* The quick reply textarea at bottom of a topic */
+/* The quick reply div at bottom of a topic */
 .wpbb-quick-reply {
     margin-left:auto;
     margin-right:auto;
-    width:50%;
     margin-bottom:100px;
     text-align:center;
+}
+/* The textarea element used for the quick reply content - determines its width/height*/
+.wpbb-quick-reply textarea {
+    min-width:400px;
+    min-height:100px;
+    max-width: 400px;
+    max-height: 100px;
+}
+#wpbb-message-subject-date {
+    float:left;
+}

wp-bulletin-board/trunk/php/admin/wpbb-admin-categories.php

-                      r603518
+                      r607181
         foreach ($roles as $role) {
             if ($_POST['wpbbadvancedpermissionstable'.$role.'view']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'view'])) {
                 $permissions['view'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'read']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'read'])) {
                 $permissions['read'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'post']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'post'])) {
                 $permissions['post'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'reply']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'reply'])) {
                 $permissions['reply'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'edit']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'edit'])) {
                 $permissions['edit'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'lock']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'lock'])) {
                 $permissions['lock'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'delete']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'delete'])) {
                 $permissions['delete'][] = $role;
+            }
             if ($_POST['wpbbadvancedpermissionstable'.$role.'sticky']) {
+            if (isset($_POST['wpbbadvancedpermissionstable'.$role.'sticky'])) {
                 $permissions['sticky'][] = $role;
+            }
+        }
+        // This is a category
+        $forum_id = 0;
+        $subforum_id = 0;
         $view_permissions = implode(",", $permissions['view']);
 …
         $data = array(
             'name' => $name,
             'forum' => 0,
             'subforum' => 0,
+            'forum' => $forum_id,
+            'subforum' => $subforum_id,
             'view' => $view_permissions,
             'read' => $read_permissions,
 …
         if ($update_forum) {
+            //echo "<div id='message' class='updated'>Category ID ".$id." updated succesfully </div>";
+            echo "<div id='message' class='updated'>";
+            printf(__('Category ID %d updated successfully', 'wp-bb'), $id);
+            echo "</div>";
+            ?>
+            <div id='message' class='updated'>
+                <?php printf(__('Category ID %d updated successfully', 'wp-bb'), $id); ?>
+            </div>
+            <?php
         } else {
             //echo "<div id='message' class='error'>Error updating Category ID ".$id."</div>";
             echo "<div id='message' class='error'>";
             printf(__('Error updating Category ID %d', 'wp-bb'), $id);
             echo "</div>";
+            ?>
+            <div id='message' class='error'>
+                <?php printf(__('Error updating Category ID %d', 'wp-bb'), $id); ?>
+            </div>
+            <?php
+        }
+    }
 …
         if ($delete === false) {
+            //echo "<div id='message' class='error'>There was an error deleting Category ID ".$id." from the database.</div>";
+            echo "<div id='message' class='error'>";
+            printf(__('There was an error deleting Category ID %d, please try again.', 'wp-bb'), $id);
+            echo "</div>";
+            ?>
+            <div id='message' class='error'>
+                <?php printf(__('There was an error deleting Category ID %d, please try again.', 'wp-bb'), $id); ?>
+            </div>
+            <?php
         } else {
             echo "<div id='message' class='updated'>";
             //echo "<div id='message' class='updated'>Category ID ".$id." deleted successfully.</div>";
             printf(__('Category ID %d deleted successfully.', 'wp-bb'), $id);
             echo "</div>";
+            ?>
+            <div id='message' class='updated'>
+                <?php printf(__('Category ID %d deleted successfully.', 'wp-bb'), $id); ?>
+            </div>
+            <?php
+        }
 …
     $id = absint($_GET['id']);
     echo "<h3>".__('Confirm Delete Request', 'wp-bb')."</h3>";
+    //echo "Are you sure you want to delete Category ID ".$id."?";
     printf(__('Are you sure you want to delete Category ID %d?', 'wp-bb'), $id);
     echo "<form method='POST' action='#'>";
     echo "<input type='radio' name='wpbb-confirm-delete' value='yes' checked='no' /> ".__('Yes', 'wp-bb');
     echo "<input type='radio' name='wpbb-confirm-delete' value='no' checked='no' /> ".__('No', 'wp-bb');
     echo "<input type='hidden' name='wpbb-confirm-delete-id' value='".$id."' />";
     echo "<input type='submit' name='wpbb-confirm-delete-submit' value='".__('Confirm', 'wp-bb')."' />";
     echo "</form>";
+    ?>
+    <h3><?php _e('Confirm Delete Request', 'wp-bb'); ?></h3>
+    <?php printf(__('Are you sure you want to delete Category ID %d?', 'wp-bb'), $id); ?>
+    <form method='POST' action='#'>
+        <input type='radio' name='wpbb-confirm-delete' value='yes' checked='no' /> <?php _e('Yes', 'wp-bb'); ?>
+        <input type='radio' name='wpbb-confirm-delete' value='no' checked='no' /> <?php _e('No', 'wp-bb'); ?>
+        <input type='hidden' name='wpbb-confirm-delete-id' value='<?php echo $id; ?>' />
+        <input type='submit' name='wpbb-confirm-delete-submit' value='<?php _e('Confirm', 'wp-bb'); ?>' />
+    </form>
+    <?php
     return;
+}

wp-bulletin-board/trunk/php/admin/wpbb-admin-faq-support.php

-                      r603518
+                      r607181
         <dl>
             <dt><b><?php _e('Support Forums', 'wp-bb'); ?></b></dt>
             <dd>http://codebycarter.com/wpbb/forums</dd>
+            <dd>http://wordpress.org/support/plugin/wp-bulletin-board</dd>
             <dt><b><?php _e('Author Email', 'wp-bb'); ?></b></dt>
             <dd>[email protected]</dd>
 …
                 <b>
                     <?php
-                        $options = get_option('wpbb_options');
                         _e('Your version', 'wp-bb');
                     ?>
 …
             <dd>
                 <?php
+                if (isset($options['version'])) {
+                    $options['version'];
+                } else {
+                    _e('Unknown version', 'wp-bb');
+                }
+                    echo WPBB_VERSION;
                 ?>
             </dd>

wp-bulletin-board/trunk/php/admin/wpbb-admin-settings.php

-                      r603518
+                      r607181
     (string) $facebook_state = wp_strip_all_tags($_POST['wpbbfacebookstate']);
+    $faceboook_default_role = strtolower(wp_strip_all_tags($_POST['wpbbfacebookdefaultrole']));
     $new_facebook_options = array(
         'allow_facebook' => $facebook_support,
 …
         'facebook_app_secret_key' => $facebook_app_secret_key,
         'facebook_redirect_uri' => $facebook_redirect_uri,
+        'facebook_state' => $facebook_state
+        'facebook_state' => $facebook_state,
+        'facebook_default_role' => $faceboook_default_role
     );
 …
                 </th>
                 <td>
+                <?php
+                    if (isset($facebook_options['facebook_app_id'])) {
+                        $facebook_app_id_value = $facebook_options['facebook_app_id'];
+                    } else {
+                        $facebook_app_id_value = "Enter your App ID / API Key";
+                    }
+                    if (isset($facebook_options['facebook_app_secret_key'])) {
+                        $facebook_app_secret_key_value = $facebook_options['facebook_app_secret_key'];
+                    } else {
+                        $facebook_app_secret_key_value = "Enter your App Secret Key";
+                    }
+                    if (isset($facebook_options['facebook_redirect_uri'])) {
+                        $facebook_redirect_uri_value = $facebook_options['facebook_redirect_uri'];
+                    } else {
+                        $facebook_redirect_uri_value = "http://www.yoursite.com";
+                    }
+                    if (isset($facebook_options['facebook_state'])) {
+                        $facebook_state_value = $facebook_options['facebook_state'];
+                    }
+                ?>
+                    <?php
+                    // App ID
+                    $facebook_app_id_value = (isset($facebook_options['facebook_app_id'])) ? $facebook_options['facebook_app_id'] : "Enter your App ID / API Key";
+                    // App secret key
+                    $facebook_app_secret_key_value = (isset($facebook_options['facebook_app_secret_key'])) ? $facebook_options['facebook_app_secret_key'] : "Enter your App Secret Key";
+                    // Redirect URL
+                    $facebook_redirect_uri_value = (isset($facebook_options['facebook_redirect_uri'])) ? $facebook_options['facebook_redirect_uri'] : "http://www.yoursite.com";
+                    // Facebook state
+                    $facebook_state_value = (isset($facebook_options['facebook_state'])) ? $facebook_options['facebook_state'] : 'Enter a unique string (letters and numbers only';
+                    // Facebook default role
+                    $facebook_default_role = (isset($facebook_options['facebook_default_role'])) ? $facebook_options['facebook_default_role'] : 'Enter a default role for new Facebook registrations';
+                    ?>
                     <input type='text' name='wpbbfacebookappid' value="<?php echo $facebook_app_id_value; ?>"/>
                 </td>
 …
                 </th>
                 <td>
                     <input type='text' name='wpbbfacebookredirecturi' value="<?php echo $facebook_redirect_uri_value; ?>"/>
+                    <input type='text' name="wpbbfacebookredirecturi" value="<?php echo $facebook_redirect_uri_value; ?>"/>
                 </td>
             </tr>
 …
                 </th>
                 <td>
+                    <input type='text' name='wpbbfacebookstate' value="<?php echo $facebook_state_value; ?>" />
+                </td>
+            </tr>
+            <tr>
+                    <input type="text" name="wpbbfacebookstate" value="<?php echo $facebook_state_value; ?>" />
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    <label for="wpbbfacebookdefaultrole"><?php _e('Default Role', 'wp-bb'); ?></label>
+                </th>
+                <td>
+                    <input type="text" name="wpbbfacebookdefaultrole" value="<?php echo strtolower($facebook_default_role); ?>"/>
+                </td>
+            </tr>
+            <tr>
                 <td><input type="submit" name="wpbb-facebook-settings-submit" class="button-primary" value="<?php _e('Save Changes', 'wp-bb'); ?>" /></td>
             </tr>

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

-                      r603518
+                      r607181
 } else { // User is not logged in
-    if (!isset($_GET['state']) && !isset($_GET['code'])) {
-        ?>
-        <div class="wpbb-centered-bold">
-            <a href='<?php echo wpbb_get_facebook_login(); ?>'><?php _e('Login using Facebook', 'wp-bb'); ?></a>
-            <?php _e('or', 'wp-bb'); ?>
-            <a href='<?php echo add_query_arg(array('register' => '', 'method' => 'facebook'), get_permalink()); ?>'><?php _e('Register using Facebook', 'wp-bb'); ?></a>
-        </div>
-        <?php
+    }
     // Registering for a Wordpress account through Facebook
     if ((isset($_GET['register'])) && (isset($_GET['method'])) && (count($_GET) == 2)) {
+        $registration_enabled = get_option('users_can_register');
+        if (!$registration_enabled) {
+            ?>
+            <div class="wpbb-centered">
+                <?php
+                    _e('Sorry, the administrator has disabled user registrations.', 'wp-bb');
+                    wpbb_exit();
+                ?>
+            </div>
+            <?php
+        }
         ?>
         <h2 class="wpbb-centered-bold">
 …
                     if ($facebook_user['id'] != 0) { // User is logged into Facebook
                         $logged_into_facebook = true;
                         if (!isset($facebook_user['email'])) {
+                            _e('Could not log you in using Facebook. You must authorize the app to allow it to use your email address for validation', 'wp-bb');
+                            exit();
+                            ?>
+                            <div class="wpbb-message-failure">
+                                <?php
+                                _e('Could not log you in using Facebook. You must authorize the app to allow it to use your email address for validation', 'wp-bb');
+                                ?>
+                            </div>
+                            <?php
+                            wpbb_exit();
+                        }
                         $email_exists = email_exists($facebook_user['email']);
                         if ($email_exists === false) {
+                            _e('You must register for an account using Wordpress or Facebook before logging in.', 'wp-bb');
+                            exit();
+                        }
+                            ?>
+                            <div class="wpbb-message-failure">
+                                <?php
+                                _e('You must register for an account using Wordpress or Facebook before logging in.', 'wp-bb');
+                                ?>
+                            </div>
+                            <?php
+                            wpbb_exit();
+                        }
                         ?>
                         <h2 class="wpbb-centered-bold">
+                        <?php _e('Login to Wordpress', 'wp-bb'); ?>
+                        </h2><br />
+                        <div class="wpbb-centered">
+                        <?php printf(__('Thankyou 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
+                        $forum_page_url = get_page($forum_page);
+                        $args = array(
+                            'echo' => true,
+                            'redirect' => $forum_page_url->guid,
+                            'remember' => true,
+                            'value_username' => $facebook_user['name'],
+                            'value_remember' => 1
+                        );
+                        $user = get_user_by('email', $facebook_user['email']);
+                        $access_token = wp_strip_all_tags($para['access_token']);
+                        $add_user_facebook_meta = update_user_meta($user->ID, 'wpbb_facebook_access_token', $access_token);
+                        wp_login_form($args);
+                        ?>
+                            <?php _e('Login to Wordpress', 'wp-bb'); ?>
+                        </h2>
+                        <br />
+                        <div class="wpbb-centered">
+                            <?php printf(__('Thankyou 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
+                            $forum_page_url = get_page($forum_page);
+                            $args = array(
+                                'echo' => true,
+                                'redirect' => $forum_page_url->guid,
+                                'remember' => true,
+                                'value_username' => $facebook_user['name'],
+                                'value_remember' => 1
+                            );
+                            $user = get_user_by('email', $facebook_user['email']);
+                            $access_token = wp_strip_all_tags($para['access_token']);
+                            $add_user_facebook_meta = update_user_meta($user->ID, 'wpbb_facebook_access_token', $access_token);
+                            wp_login_form($args);
+                            ?>
                         </div>
                         <?php
                     } else {
                         _e('Please login to Facebook', 'wp-bb');
+                    }
+                }
             } else { // Possible CSRF victim
+                _e('There was an error logging you into Facebook. Please try again', 'wp-bb');
+                exit();
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php
+                    _e('There was an error logging you into Facebook. Please try again', 'wp-bb');
+                    ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
         } else { // State was not provided
+            _e('You must provide a state (a random string of variable length) in your Facebook Settings');
+            exit();
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
+                _e('You must provide a state (a random string of variable length) in your Facebook Settings');
+                ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
 …
     $password = $data['registration']['password'];
     $email = $data['registration']['email'];
+    $create_user = wp_create_user($username, $password, $email);
+    $facebook_options = get_option('wpbb_facebook_options');
+    $role = $facebook_options['facebook_default_role'];
+    //$create_user = wp_create_user($username, $password, $email);
+    $create_user = wp_insert_user(array('user_login' => $username, 'user_pass' => $password, 'user_email' => $email, 'role' => $role));
     if (is_wp_error($create_user)) {
         $errors = $create_user->get_error_messages();
-        var_dump($errors);
         foreach ($errors as $err) {
+            echo $err;
+        }
+        exit();
+            wpbb_goback1('facebook-register-uname-exists', NULL);
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
+                echo $err;
+                ?>
+            </div>
+            <?php
+        }
+        wpbb_exit();
     } else {
+        _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+        // Display login form
+        wp_login_form();
+        ?>
+        <div class="wpbb-message-success">
+            <?php
+            _e('Thankyou for registering. Please login with your Facebook username and password you just created', 'wp-bb');
+            ?>
+        </div>
+        <div class="wpbb-centered">
+            <?php
+            wp_login_form();
+            ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+}

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

-                      r603518
+                      r607181
     Displays Twitter Follow button if twitter is enabled
 */
+$twitter_username = "http://api.twitter.com/1/users/show.xml?screen_name=".$wpbb_twitter_options['twitter_account'];
+if (!@fopen($twitter_username, 'r')) {
+    ?>
+    <div class="wpbb-message-failure">
+        <p>Invalid twitter username supplied. Please enter a correct username or disable twitter support.</p>
+    </div>
+    <?php
+}
 if (count($_GET) == 0) {

wp-bulletin-board/trunk/php/wpbb-all-messages.php

-                      r604868
+                      r607181
 <?php
+wpbb_goback1('all-messages', NULL);
+$user_id = get_current_user_id();
+if ($user_id == 0) {
+    ?>
+    <div class="wpbb-centered-bold">
+        <?php
+            _e('Please register or login to view this page', 'wp-bb');
+            wpbb_exit();
+        ?>
+    </div>
+    <?php
+}
+$user_id = wpbb_is_user_logged_in();
 global $wpdb;
+?>
+<h1 id="wpbb-h-1" class="wpbb-centered-bold">
+    <?php _e('My Messages', 'wp-bb'); ?>
+</h1>
+<a href='<?php echo add_query_arg(array('message' => 'to'), wpbb_permalink()); ?>'>
+    <p class="wpbb-centered">
+            <?php _e('Compose Message', 'wp-bb'); ?>
+    </p>
+</a>
+<?php
+// Viewing all messages
+if ((isset($_GET['messages']))
+    && ($_GET['messages'] == 'all')
+    && (count($_GET) == 1 || count($_GET) == 2)) {
+    ?>
+    <h2 class="wpbb-centered-bold">
+        <?php _e('My Messages', 'wp-bb'); ?>
+    </h2>
+    <a href='<?php echo add_query_arg(array('message' => 'to'), get_permalink()); ?>'>
+        <p class="wpbb-centered">
+            <?php _e('Compose Message', 'wp-bb'); ?>
+        </p>
+    </a>
+    <?php
+        if ($user_id != 0) {
+            $options = get_option('wpbb_options');
+            $topics_per_page = $options['topics_per_page'];
+            if (isset($_GET['current_page'])) {
+                if ($_GET['current_page'] == 0) {
+                    $current_page = 1;
+                    $start = 0;
+                    $limit = $topics_per_page;
+                } else if ($_GET['current_page'] == 1) {
+                    $current_page = 1;
+                    $start = 0;
+                    $limit = $topics_per_page;
+                } else {
+                    $current_page = $_GET['current_page'];
+                    $start = $current_page * $topics_per_page - $topics_per_page;
+                    $limit = $start + $topics_per_page;
+                }
+            }
+            $total_msgs = $wpdb->get_var("SELECT COUNT(*) as 'Messages' FROM ".MESSAGES_TABLE." WHERE `to` = $user_id;");
+            $msgs = false;
+            if ($total_msgs > 0) {
+                wpbb_pagination(NULL, $current_page, $start, $limit, $total_msgs, $topics_per_page, true, 'messages');
+                $msgs = $wpdb->get_results("SELECT * FROM ".MESSAGES_TABLE." WHERE `to` = $user_id ORDER BY sent DESC LIMIT $start, $limit;");
+            }
+            if ($msgs) {
+                ?>
+                <table class="wpbb-table">
+                <th><?php _e('From', 'wp-bb'); ?></th>
+                <th><?php _e('Subject', 'wp-bb'); ?></th>
+                <th><?php _e('Read', 'wp-bb'); ?></th>
+                <th><?php _e('Sent', 'wp-bb'); ?></th>
+                <th><?php _e('Action', 'wp-bb'); ?></th>
+if ($user_id != 0) {
+    $options = get_option('wpbb_options');
+    $topics_per_page = $options['topics_per_page'];
+    if (isset($_GET['current_page'])) {
+        if ($_GET['current_page'] == 0) {
+            $current_page = 1;
+            $start = 0;
+            $limit = $topics_per_page;
+        } else if ($_GET['current_page'] == 1) {
+            $current_page = 1;
+            $start = 0;
+            $limit = $topics_per_page;
+        } else {
+            $current_page = $_GET['current_page'];
+            $start = $current_page * $topics_per_page - $topics_per_page;
+            $limit = $start + $topics_per_page;
+        }
+    }
+    $total_msgs = $wpdb->get_var("SELECT COUNT(*) as 'Messages' FROM ".MESSAGES_TABLE." WHERE `to` = $user_id;");
+    $msgs = false;
+    if (($total_msgs > 0) && ($total_msgs > $topics_per_page)) {
+        wpbb_pagination(NULL, $current_page, $start, $limit, $total_msgs, $topics_per_page, true, 'messages');
+        $msgs = $wpdb->get_results("SELECT * FROM ".MESSAGES_TABLE." WHERE `to` = $user_id ORDER BY sent DESC LIMIT $start, $limit;");
+    }
+    if ($msgs) {
+        wpbb_goback1('all-messages', NULL);
+        ?>
+        <table class="wpbb-table">
+            <th><?php _e('From', 'wp-bb'); ?></th>
+            <th><?php _e('Subject', 'wp-bb'); ?></th>
+            <th><?php _e('Read', 'wp-bb'); ?></th>
+            <th><?php _e('Sent', 'wp-bb'); ?></th>
+            <th><?php _e('Action', 'wp-bb'); ?></th>
                 <?php
                 foreach ($msgs as $msg) {
 …
                         <td>
                             <a href='<?php echo add_query_arg(array('messages' => 'all', 'view' => $msg->id)); ?>'>
+                            <a href='<?php echo add_query_arg(array('messages' => 'all', 'view' => $msg->id), wpbb_permalink()); ?>'>
                                 <?php printf(__('%s'), $msg->subject); ?>
                             </a>
 …
                         </td>
                         <td>
                             <a href='<?php echo add_query_arg(array('delete_msg' => $msg->id)); ?>'>
+                            <a href='<?php echo add_query_arg(array('messages' => 'all', 'delete_msg' => $msg->id), wpbb_permalink()); ?>'>
                                 <?php _e('Delete', 'wp-bb'); ?>
+                            </a>
+                            <a href="<?php echo add_query_arg(array('message' => $msg->from), wpbb_permalink()); ?>">
+                                <?php _e('Reply', 'wp-bb'); ?>
                             </a>
                         </td
 …
             <?php
         } else {
+            wpbb_goback1('all-messages', NULL);
             ?>
             <div class="wpbb-centered-bold">
                 <?php _e('You do not have any messages', 'wp-bb'); ?>
+            <div class="wpbb-message-failure">
+                <?php printf(__('You do not have any messages. <a href="%s">Compose one?</a>'), add_query_arg(array('message' => 'to'), wpbb_permalink())); ?>
             </div>
         <?php
+        }
+    }
+}
-// Deleting a message
-if ((isset($_GET['delete_msg']))
-    && (isset($_GET['messages']))
-    && (count($_GET) === 2)) {
-    $id = absint($_GET['delete_msg']);
-    $delete_message = $wpdb->query("DELETE FROM ".MESSAGES_TABLE." WHERE id = $id;");
-    if ($delete_message === false) {
-        ?>
-        <div class="wpbb-centered-bold">
-            <?php _e('Error deleting message. Please try again', 'wp-bb'); ?>
-        </div>
-        <?php
-    } else {
-        ?>
-        <div class="wpbb-centered-bold">
-        <?php _e('Thankyou. That message has been deleted successfully.', 'wp-bb'); ?>
-        </div>
-        <?php
+    }
+}
 ?>

wp-bulletin-board/trunk/php/wpbb-create-topic.php

r604652	r607181
4	4
5	5	$forum_id = absint($_GET['forum']);
	6
	7	wpbb_check_exists('forum', $forum_id);
6	8
7	9	if ((isset($_GET['forum'])) && (!isset($_GET['subforum']))) {

wp-bulletin-board/trunk/php/wpbb-delete-topic.php

-                      r603518
+                      r607181
 <?php
+    wpbb_goback1();
     // Check user has permissions to delete topics or posts in this forum
 …
                 ?>
                 <div class="wpbb-centered-bold">
+                    <?php printf(__('You decided not to delete topic ID %s. You will be redirected'), $topic_id); ?>
+                    <?php
+                        printf(__('You decided not to delete topic ID %s. Click "Go back" to return to the topic.'), $topic_id);
+                    ?>
                 </div>
                 <?php
 …
         if ($changed_mind !== true && $success !== true) {
             ?>
             <h2 class="wpbb-centered-bold"><?php _e('Confirm Topic Delete Request', 'wp-bb'); ?></h2>
             <div class="wpbb-centered-bold">
                 <?php printf(__('Are you sure you want to delete topic ID %s ? (WARNING: All posts in this topic will be deleted. This proccess cannot be undone!)'), $topic_id); ?>
+            <h1 id="wpbb-h-1" class="wpbb-centered-bold"><?php _e('Confirm Topic Delete Request', 'wp-bb'); ?></h1>
+            <div class="wpbb-message-warning">
+                <?php printf(__('Are you sure you want to delete topic ID %s? WARNING: All posts in this topic will be deleted. This proccess cannot be undone!'), $topic_id); ?>
             </div>
             <form method='POST' action='#' style='text-align:center;'>

wp-bulletin-board/trunk/php/wpbb-edit-topic.php

-                      r604652
+                      r607181
 <?php
+    if ((isset($_GET['topic'])) && (!isset($_GET['post']))) {
+        $is_topic = true;
+        $is_post = false;
+    }
+    if ((isset($_GET['post'])) && (isset($_GET['topic']))) {
+        $is_post = true;
+        $is_topic = false;
+    }
+    $forum_id = absint($_GET['forum']);
+    $user_id = get_current_user_id();
+    $topic_id = absint($_GET['topic']);
+    if (isset($_GET['post'])) {
+        $post_id = absint($_GET['post']);
+    }
+    $view_permissions = wpbb_user_has_permission($user_id, $forum_id);
+    if ($view_permissions === false) {
+        wpbb_goback1('edit-topic-denied', NULL);
+        ?>
+        <div class="wpbb-message-failure">
+            <?php _e('You do not have the required permissions to view this forum!', 'wp-bb'); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    } else {
+        $edit_permissions = wpbb_user_has_permission($user_id, $forum_id, 'edit');
+        if ($is_topic === true) {
+            $editing_own_topic = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $topic_id AND author = $user_id;");
+            // If user does not have edit permissions and is not editing own topic then they are trying to edit someone elses topic!
+            if (($edit_permissions === false) && (!$editing_own_topic)) {
+                wpbb_goback1('edit-other-topic-denied', NULL);
+// Display a "Go back" link
+wpbb_goback1();
+$is_post = isset($_GET['post']) ? true : false;
+$forum_id = absint($_GET['forum']);
+$user_id = get_current_user_id();
+$topic_id = absint($_GET['topic']);
+if (isset($_GET['post'])) {
+    $post_id = absint($_GET['post']);
+}
+$view_permissions = wpbb_user_has_permission($user_id, $forum_id);
+if ($view_permissions === false) {
+    ?>
+    <div class="wpbb-message-failure">
+        <?php _e('You do not have the required permissions to view this forum!', 'wp-bb'); ?>
+    </div>
+    <?php
+    wpbb_exit();
+} else {
+    $edit_permissions = wpbb_user_has_permission($user_id, $forum_id, 'edit');
+    if ($is_post === false) {
+        $editing_own_topic = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $topic_id AND author = $user_id;");
+        // If user does not have edit permissions and is not editing own topic then they are trying to edit someone elses topic!
+        if (($edit_permissions === false) && (!$editing_own_topic)) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You do not have the required permissions to edit other peoples topics in this forum!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    } else if ($is_post === true) {
+        $editing_own_post = $wpdb->get_var("SELECT id FROM ".POST_TABLE." WHERE id = $post_id AND author = $user_id;");
+        // If user does not have edit permissions and is not editing own post then they are trying to edit someone elses topic!
+        if (($edit_permissions === false) && (!$editing_own_post)) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You do not have the required permissions to edit other peoples posts in this forum!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
+}
+if ($is_post === false) {
+    // Form submission
+    if (isset($_POST['wpbbtopiceditsubmit'])) {
+        if (empty($_POST['wpbbtopiccontent']) || empty($_POST['wpbbtopicname'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must enter a title and some content for your topic', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        // Sanitize topic title
+        $topic_name = wp_strip_all_tags($_POST['wpbbtopicname']);
+        if (is_numeric($_POST['wpbbauthorname'])) { // ID supplied
+            $topic_author = absint($_POST['wpbbauthorname']);
+        } else if (is_string($_POST['wpbbauthorname'])) { // Name supplied
+            $topic_author_name = wp_strip_all_tags($_POST['wpbbauthorname']);
+            $topic_author = wpbb_parse_author_name(NULL, $topic_author_name);
+        }
+        $topic_content = wpbb_strip_tags($_POST['wpbbtopiccontent']);
+        if (($_POST['wpbbtopicforum'] == 'yes') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+            $topic_forum = absint($_POST['wpbbtopicforumname']);
+            // Check category exists otherwise do not allow submission to proceed
+            $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_forum;");
+            if ($exists === false) {
                 ?>
                 <div class="wpbb-message-failure">
                     <?php _e('You do not have the required permissions to edit other peoples topics in this forum!', 'wp-bb'); ?>
+                    <?php _e('That category does not exist. Please make sure you choose a valid category.', 'wp-bb'); ?>
                 </div>
                 <?php
                 wpbb_exit();
+            }
+        } else if ($is_post === true) {
+            $editing_own_post = $wpdb->get_var("SELECT id FROM ".POST_TABLE." WHERE id = $post_id AND author = $user_id;");
+            // If user does not have edit permissions and is not editing own post then they are trying to edit someone elses topic!
+            if (($edit_permissions === false) && (!$editing_own_post)) {
+                wpbb_goback1('edit-other-post-denied', NULL);
+            $topic_subforum = 0;
+        } else if (($_POST['wpbbtopicsubforum'] == 'yes') && ($_POST['wpbbtopicforum'] == 'no')) {
+            $topic_subforum = absint($_POST['wpbbtopicsubforumname']);
+            // Check forum exists otherwise do not allow submission to proceed
+            $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_subforum;");
+            if ($exists === false) {
                 ?>
                 <div class="wpbb-message-failure">
                     <?php _e('You do not have the required permissions to edit other peoples posts in this forum!', 'wp-bb'); ?>
+                    <?php _e('That forum does not exist. Please make sure you choose a valid forum.', 'wp-bb'); ?>
                 </div>
                 <?php
                 wpbb_exit();
+            }
+        }
+    }
+    //if (isset($_GET['topic']) && (!isset($_GET['post']))) { // It's a topic
+    if ($is_topic === true) {
+        // Form submission
+        if (isset($_POST['wpbbtopiceditsubmit'])) {
+            if (empty($_POST['wpbbtopiccontent']) || empty($_POST['wpbbtopicname'])) {
+                wpbb_goback1('edit-topic-submit-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must enter a title and some content for your topic', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            // Sanitize topic title
+            $topic_name = wp_strip_all_tags($_POST['wpbbtopicname']);
+            // Sanitize author name
+            $topic_author_name = wp_strip_all_tags($_POST['wpbbauthorname']);
+            // Get ID back from the sanitized author name
+            $topic_author = wpbb_parse_author_name(NULL, $topic_author_name);
+            $topic_content = wpbb_strip_tags($_POST['wpbbtopiccontent']);
+            if (($_POST['wpbbtopicforum'] == 'yes') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+                $topic_forum = absint($_POST['wpbbtopicforumname']);
+                // Check category exists otherwise do not allow submission to proceed
+                $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_forum;");
+                if ($exists === false) {
+                    wpbb_goback1('edit-topic-cat-exists-error', NULL);
+                    ?>
+                    <div class="wpbb-message-failure">
+                        <?php _e('That category does not exist. Please make sure you choose a valid category.', 'wp-bb'); ?>
+                    </div>
+                    <?php
+                    wpbb_exit();
+                }
+                $topic_subforum = 0;
+            } else if (($_POST['wpbbtopicsubforum'] == 'yes') && ($_POST['wpbbtopicforum'] == 'no')) {
+                $topic_subforum = absint($_POST['wpbbtopicsubforumname']);
+                // Check forum exists otherwise do not allow submission to proceed
+                $exists = $wpdb->query("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $topic_subforum;");
+                if ($exists === false) {
+                    wpbb_goback1('edit-topic-forum-exists-error', NULL);
+                    ?>
+                    <div class="wpbb-message-failure">
+                        <?php _e('That forum does not exist. Please make sure you choose a valid forum.', 'wp-bb'); ?>
+                    </div>
+                    <?php
+                    wpbb_exit();
+                }
+                $topic_forum = 0;
+            } else if (($_POST['wpbbtopicforum'] == 'no') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+                wpbb_goback1('edit-topic-select-cat-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must select a category or forum for the topic to be posted in.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            if (isset($_POST['wpbbtopicstatus'])) {
+                $topic_status = implode(",", (array) $_POST['wpbbtopicstatus']);
+            } else {
+                $topic_status = "";
+            }
+            $data = array(
+                'name' => $topic_name,
+                'author' => $topic_author,
+                'content' => $topic_content,
+                'forum' => $topic_forum,
+                'subforum' => $topic_subforum,
+                'status' => $topic_status
+            );
+            $save_topic = $wpdb->update(TOPIC_TABLE, $data, array('id' => $topic_id));
+            if ($save_topic !== false) {
+                wpbb_goback1('edit-topic-success', NULL);
+                ?>
+                <div class="wpbb-message-success">
+                    <?php printf(__('Topic ID %s edited successfully'), $topic_id); ?>
+                </div>
+                <?php
+            } else {
+                wpbb_goback1('edit-topic-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php printf(__('There was an error editing topic ID %s'), $topic_id); ?>
+                </div>
+                <?php
+            }
+        }
+        // End Form Submission
+        $get_topic = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE id = $topic_id;");
+        if ($get_topic !== false) {
+            ?>
+            <table class="wpbb-table">
+                <form method='POST' action='#'>
+            <?php
+            foreach ($get_topic as $topic) {
+                if (strpos($topic->status, 'locked') !== false) $locked = true; else $locked = false;
+                if (strpos($topic->status, 'sticky') !== false) $sticky = true; else $sticky = false;
+                if (strpos($topic->status, 'poll') !== false) $poll = true; else $poll = false;
+                $topic_author_name = wpbb_parse_author_name($topic->author);
+                ?>
+                <tr>
+                    <th><?php _e('Name', 'wp-bb'); ?></th>
+                    <td>
+                        <input name='wpbbtopicname' maxlength='45' size='25' value='<?php echo $topic->name; ?>' />
+                    </td>
+                </tr>
+                <?php
+                if (current_user_can('manage_options')) {
+            $topic_forum = 0;
+        } else if (($_POST['wpbbtopicforum'] == 'no') && ($_POST['wpbbtopicsubforum'] == 'no')) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must select a category or forum for the topic to be posted in.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        if (isset($_POST['wpbbtopicstatus'])) {
+            $topic_status = implode(",", (array) $_POST['wpbbtopicstatus']);
+        } else {
+            $topic_status = "";
+        }
+        $data = array(
+            'name' => $topic_name,
+            'author' => $topic_author,
+            'content' => $topic_content,
+            'forum' => $topic_forum,
+            'subforum' => $topic_subforum,
+            'status' => $topic_status
+        );
+        $save_topic = $wpdb->update(TOPIC_TABLE, $data, array('id' => $topic_id));
+        if ($save_topic !== false) {
+            ?>
+            <div class="wpbb-message-success">
+                <?php printf(__('Topic ID %s edited successfully'), $topic_id); ?>
+            </div>
+            <?php
+        } else {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php printf(__('There was an error editing topic ID %s'), $topic_id); ?>
+            </div>
+            <?php
+        }
+    }
+    // End Form Submission
+    $get_topic = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE id = $topic_id;");
+    if ($get_topic !== false) {
+        ?>
+        <table class="wpbb-table">
+            <form method='POST' action='#'>
+                <?php
+                foreach ($get_topic as $topic) {
+                    $sticky = (strpos($topic->status, 'sticky') !== false) ? true : false;
+                    $locked = (strpos($topic->status, 'locked') !== false) ? true : false;
+                    $topic_author_name = wpbb_parse_author_name($topic->author);
                     ?>
                     <tr>
+                        <th><?php _e('Name', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbtopicname' maxlength='45' size='25' value='<?php echo $topic->name; ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                    if (current_user_can('manage_options')) {
+                        ?>
+                        <tr>
                         <th><?php _e('Author', 'wp-bb'); ?></th>
                         <td>
 …
                     <?php
+                }
+                if ($topic->forum > 0) $is_forum = true; else $is_forum = false;
+                if ($topic->subforum > 0) $is_subforum = true; else $is_subforum = false;
+                $is_forum = ($topic->forum > 0) ? true: false;
+                $is_subforum = ($topic->subforum > 0) ? true : false;
                 // Forums
                 ?>
 …
                     <th><?php _e('Status', 'wp-bb'); ?></th>
                     <td>
                         <input type='checkbox' name='wpbbtopicstatus[]' value='locked' ".checked($locked, true, false)."/> <?php _e('Locked', 'wp-bb'); ?>
                         <input type='checkbox' name='wpbbtopicstatus[]' value='sticky' ".checked($sticky, true, false)."/> <?php _e('Sticky', 'wp-bb'); ?>
+                        <input type='checkbox' name='wpbbtopicstatus[]' value='locked' <?php echo checked($locked, true, false); ?>/> <?php _e('Locked', 'wp-bb'); ?>
+                        <input type='checkbox' name='wpbbtopicstatus[]' value='sticky' <?php echo checked($sticky, true, false); ?>/> <?php _e('Sticky', 'wp-bb'); ?>
                     </td>
                 <tr>
 …
         ?>
         </form>
+    </table>
+    <?php
+    } else {
+        ?>
+        <div style='text-align:center; font-color:red;'>
+            <?php printf(__('There was an error fetching topic ID %s. Please try again.'), $topic_id); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+} else if ($is_post === true) { // It's a post
+    // Post edit submission
+    if (isset($_POST['wpbbeditpostsubmit'])) {
+        $post_id = absint($_GET['post']);
+        // If a topic wasn't chosen or content wasn't entered produce an error
+        if (empty($_POST['wpbbposttopic']) || empty($_POST['wpbbpostcontent'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('You must choose a topic for the post and content must not be empty!', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+        if (is_numeric($_POST['wpbbpostauthor'])) {
+            // Strip all tags from the authors name
+            $post_author_name = wp_strip_all_tags($_POST['wpbbpostauthor']);
+            // Retrieve ID back from username
+            $post_author = wpbb_parse_author_name(NULL, $post_author_name);
+        } else {
+            $post_author = absnt($_POST['wpbbpostauthor']);
+        }
+        $post_content = wpbb_strip_tags($_POST['wpbbpostcontent']);
+        $post_topic = absint($_POST['wpbbposttopic']);
+        $data = array(
+            'author' => $post_author,
+            'topic' => $post_topic,
+            'text' => $post_content
+        );
+        $update_post = $wpdb->update(POST_TABLE, $data, array('id' => $post_id));
+        $wpdb->show_errors();
+        if ($update_post === false) { // Db error
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error attempting to save your post, please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+        } else { // Success
+            ?>
+            <div class="wpbb-message-success">
+                <?php _e('Thankyou, your post has been saved successfully', 'wp-bb'); ?>
+            </div>
+            <?php
+        }
+    }
+    // End post edit submission
+    // Attempt to retrieve the post from the db
+    $get_post = $wpdb->get_results("SELECT * FROM ".POST_TABLE." WHERE id = $post_id;");
+    // If there wasn't an error...
+    if ($get_post !== false) {
+        ?>
+        <table class="wpbb-table">
+            <form method='POST' action='#'>
+                <?php
+                foreach ($get_post as $post) {
+                $post_author_name = wpbb_parse_author_name($post->author);
+                if (current_user_can('manage_options')) {
+                    ?>
+                    <tr>
+                        <th><?php _e('Author', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                } else {
+                    ?>
+                    <tr>
+                        <th><?php _e('Author', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' disabled='disabled' />
+                        </td>
+                    </tr>
+                    <?php
+                }
+                ?>
+                <tr>
+                    <th><?php _e('Topic', 'wp-bb'); ?></th>
+                    <td>
+                        <input name='wpbbposttopic' maxlength='45' size='24' value='<?php echo $post->topic; ?>' />
+                    </td>
+                </tr>
+                <tr>
+                    <th><?php _e('Content', 'wp-bb'); ?></th>
+                    <td>
+                        <?php wp_editor($post->text, 'wpbbpostcontent'); ?>
+                    </td>
+                </tr>
+                <tr>
+                    <th></th>
+                    <td>
+                        <input type='submit' name='wpbbeditpostsubmit' value='<?php _e('Save Changes', 'wp-bb'); ?>' />
+                    </td>
+                </tr>
+                <?php
+            }
+            ?>
+            </form>
         </table>
         <?php
+        } else {
+            wpbb_goback1('edit-get-topic-error', NULL);
+            ?>
+            <div style='text-align:center; font-color:red;'>
+                <?php printf(__('There was an error fetching topic ID %s. Please try again.'), $topic_id); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    } else if ($is_post === true) { // It's a post
+        // Post edit submission
+        if (isset($_POST['wpbbeditpostsubmit'])) {
+            $post_id = absint($_GET['post']);
+            // If a topic wasn't chosen or content wasn't entered produce an error
+            if (empty($_POST['wpbbposttopic']) || empty($_POST['wpbbpostcontent'])) {
+                wpbb_goback1('edit-post-empty-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('You must choose a topic for the post and content must not be empty!', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+            // Strip all tags from the authors name
+            $post_author_name = wp_strip_all_tags($_POST['wpbbpostauthor']);
+            // Use the sanitized authors name to retrive the ID of the author to then add to the DB
+            $post_author = wpbb_parse_author_name(NULL, $post_author_name);
+            // This function uses the strip_tags function only difference being you have to edit the tags you want to skip once.
+            $post_content = wpbb_strip_tags($_POST['wpbbpostcontent']);
+            $post_topic = absint($_POST['wpbbposttopic']);
+            $data = array(
+                'author' => $post_author,
+                'topic' => $post_topic,
+                'text' => $post_content
+            );
+            $update_post = $wpdb->update(POST_TABLE, $data, array('id' => $post_id));
+            $wpdb->show_errors();
+            if ($update_post === false) { // Db error
+                wpbb_goback1('edit-post-submit-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error attempting to save your post, please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+            } else { // Success
+                wpbb_goback1('edit-post-submit-success', NULL);
+                ?>
+                <div class="wpbb-message-success">
+                    <?php _e('Thankyou, your post has been saved successfully', 'wp-bb'); ?>
+                </div>
+                <?php
+            }
+        }
+        // End post edit submission
+        // Attempt to retrieve the post from the db
+        $get_post = $wpdb->get_results("SELECT * FROM ".POST_TABLE." WHERE id = $post_id;");
+        // If there wasn't an error...
+        if ($get_post !== false) {
+            ?>
+            <table class="wpbb-table">
+                <form method='POST' action='#'>
+                    <?php
+                    foreach ($get_post as $post) {
+                    $post_author_name = wpbb_parse_author_name($post->author);
+                    if (current_user_can('manage_options')) {
+                        ?>
+                        <tr>
+                            <th><?php _e('Author', 'wp-bb'); ?></th>
+                            <td>
+                                <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' />
+                            </td>
+                        </tr>
+                        <?php
+                    } else {
+                        ?>
+                        <tr>
+                            <th><?php _e('Author', 'wp-bb'); ?></th>
+                            <td>
+                                <input name='wpbbpostauthor' maxlength='45' size='25' value='<?php echo $post_author_name; ?>' disabled='disabled' />
+                            </td>
+                        </tr>
+                        <?php
+                    }
+                    ?>
+                    <tr>
+                        <th><?php _e('Topic', 'wp-bb'); ?></th>
+                        <td>
+                            <input name='wpbbposttopic' maxlength='45' size='24' value='<?php echo $post->topic; ?>' />
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td>
+                            <?php wp_editor($post->text, 'wpbbpostcontent'); ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbbeditpostsubmit' value='<?php _e('Save Changes', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <?php
+                }
+                ?>
+                </form>
+            </table>
+            <?php
+            } else { // Error
+                wpbb_goback1('edit-post-get-error', NULL);
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error retrieving the post. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+        }
+        } else { // Error
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error retrieving the post. Please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
 ?>

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

-                      r604652
+                      r607181
     Checks if the plugin is deactivated
 */
 // Since we're not in the admin area we must require the plugin.php file
 …
     ?>
     <div style="text-align:center;font-weight:bold;color:red;">
         <?php
+        <?php
             _e('The plugin is deactivated. Please reactivate the plugin to continue using WPBB', 'wp-bb');
             wpbb_exit();
 …
     <?php
+}
 // Load WPBB Options
 $wpbb_options = get_option('wpbb_options');
 …
     && (!isset($_GET['method']))
     && (!isset($_GET['state']))) {
+    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+        require_once('facebook/wpbb-facebook.php');
+    }
+    require_once('wpbb-functions.php');
     ?>
     <div class="wpbb-centered-bold">
         <?php
             printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register'));
+            wpbb_is_user_logged_in();
         ?>
     </div>
     <?php
-    // Load facebook functionality if facebook is enabled
-    if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
-        require_once('facebook/wpbb-facebook.php');
+    }
-    exit();
+}
 …
     if (current_user_can('manage_options')) {
         ?>
         <div id="wpbb-admin-maintenance-reminder">
+        <div class="wpbb-message-warning">
         <?php _e('The board is currently in maintenance mode. To turn it off change Maintenance Mode in Settings -> WPBB Settings to "Off"', 'wp-bb'); ?>
         </div>
 …
     } else {
         ?>
         <div id="wpbb-maintenance-message">
+        <div class="wpbb-message-warning">
             <?php echo $wpbb_options['maintenance_message']; ?>
         </div>
         <?php
+        if ($wpbb_facebook_options['allow_facebook'] == 'yes') {
+            require_once('facebook/wpbb-facebook.php');
+        }
+        require_once('wpbb-functions.php');
+        wpbb_footer();
         wpbb_exit();
+    }
+}
+// Simple snippet to disallow any unrecognized get key/values
+$allowed_get_values = array(
+    'forum',
+    'subforum',
+    'topic',
+    'post',
+    'current_page',
+    'action',
+    'create',
+    'profile',
+    'unread_topics',
+    'unanswered_topics',
+    'message',
+    'messages',
+    'view',
+    'code',
+    'state',
+    'register',
+    'method',
+    'login',
+    'delete_msg',
+    'page_id'
+);
+foreach ($_GET as $get => $value) {
+    if (!in_array($get, $allowed_get_values)) {
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php _e('Sorry the page you requested could not be found. Please try again.', 'wp-bb'); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    }
+}
+/*
+    Loads all functions
+*/
+require_once('wpbb-functions.php');
+/*
+    Checks a page supplied exists
+*/
+wpbb_page_exists();
 /*
 …
+}
 /*
     Twitter
 …
+}
-/*
-    Load all Functions
-*/
-require_once('wpbb-functions.php');
 …
+    }
+    /*
+        Viewing All Messages (& Delete)
+    /*
+        Viewing All Messages
     */
     if ((isset($_GET['messages']))
         && (isset($_GET['page_id']))
         && (isset($_GET['current_page']))
         && ($_GET['messages'] == 'all')) {
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 3)) {
         require_once('wpbb-all-messages.php');
+    }
+    /*
+        Deleting a message
+    */
+    if ((isset($_GET['messages']) && $_GET['messages'] == 'all')
+        && (isset($_GET['delete_msg']))
+        && (isset($_GET['page_id']))
+        && (count($_GET) > 1 && count($_GET) <= 3)) {
+        require_once('wpbb-delete-message.php');
+    }
 …
     /*
+        Viewing All Messages (& Delete)
+    */
+        Viewing All Messages
+    */
+    if ((isset($_GET['messages']))
+        && ($_GET['messages'] == 'all')
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 2 || count($_GET) == 3)) {
+        require_once('wpbb-all-messages.php');
+    }
+    /*
+        Deleting a message
+    */
     if ((isset($_GET['messages']))
         && ($_GET['messages'] == 'all')
+        && (isset($_GET['current_page']))
+        && (count($_GET) == 2)) {
+        require_once('wpbb-all-messages.php');
+    }
+        && (isset($_GET['delete_msg']))
+        && (count($_GET) > 1 && count($_GET) <= 2)) {
+        require_once('wpbb-delete-message.php');
+    }
     /*
         Viewing Individual Message
 …
     if ((isset($_GET['messages']))
         && ($_GET['messages'] == 'all')
         && ((isset($_GET['view'])) && ($_GET['view']))
         && (count($_GET) == 2)) {
+        && ((isset($_GET['view']))
+        && (count($_GET) == 2))) {
         require_once('wpbb-view-message.php');
+    }
 …
+}
+// Displays the wpbb powered by footer if it is enabled
+if ($wpbb_options['show_footer'] == 'yes') {
+    ?>
+    <div class="wpbb-forum-footer">
+        Powered by <a href="<?php echo WPBB_PLUGIN_URL; ?>">WPBB</a> <?php if (isset($wpbb_options['version'])) echo $wpbb_options['version']; ?>
+    </div>
+    <?php
+}
+wpbb_footer();
 ?>

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

-                      r604652
+                      r607181
+ *
+ *
  * @since 1.0.1
+ * @since 1.0.2
+ *
  * @param    int        $forum_id       The ID of the forum
 …
     $forum_id = isset($_GET['forum']) ? $_GET['forum'] : NULL;
     $subforum_id = isset($_GET['subforum']) ? $_GET['subforum'] : NULL;
+    $topic_id = isset($_GET['topic']) ? $_GET['topic'] : NULL;
     $query_args = array('forum' => $forum_id, 'subforum' => $subforum_id, 'topic' => $topic_id, 'current_page' => 1);
     $count = array();
 …
+    }
     switch ($where) {
+        case 'forum-index':
+        ?>
+        <div class="wpbb-centered-bold">
+            <a href="<?php echo $permalink; ?>">Go back</a>
+        </div>
+        <?php
+        break;
         default:
         ?>
 …
     if (empty($user_roles)) {
+        wpbb_goback1('forum-index', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
+}
+/**
+ * WPBB version of is_user_logged_in(). Displays error message or returns user ID
+ *
+ * Displays a login/register (wordpress/facebook) message if no user ID is found otherwise returns the user ID
+ *
+ * @since 1.0.2
+ *
+ * @return  int  $user_id   Returns the user ID if the current user is logged in
+ *
+ */
+function wpbb_is_user_logged_in() {
+    $options = get_option('wpbb_options');
+    $facebook_options = get_option('wpbb_facebook_options');
+    $user_id = get_current_user_id();
+    if ($user_id === NULL || $user_id === 0) {
+        if ($facebook_options['allow_facebook'] == 'yes') {
+            $facebook_register_url = add_query_arg(array('register' => '', 'method' => 'facebook'), wpbb_permalink());
+            $facebook_login_url = wpbb_get_facebook_login();
+            ?>
+            <div class="wpbb-centered-bold">
+                <a href="<?php echo $facebook_login_url; ?>"><?php _e('Login using Facebook', 'wp-bb'); ?></a>
+                <?php _e('or', 'wp-bb'); ?>
+                <a href="<?php echo $facebook_register_url; ?>"><?php _e('Register using Facebook', 'wp-bb'); ?></a>
+            </div>
+            <?php
+        }
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register')); ?>
+        </div>
+        <?php
+        wpbb_exit();
+    } else {
+        return $user_id;
+    }
+}
+/**
+ * Checks whether a forum, subforum or topic exists depending on arguments provided
+ *
+ *
+ * @since 1.0.2
+ *
+ * @param   string  $what       Must be one of three: 'forum', 'subforum' or 'topic' - refers to what you are checking exists. Default is forum.
+ * @param   int     $what_id    Must be set and an integer otherwise won't return anything
+ * @return  int     $user_id    Returns the user ID if the current user is logged in
+ *
+ */
+function wpbb_check_exists($what = 'forum', $what_id) {
+    if ((isset($what)) && (is_numeric($what_id))) {
+        global $wpdb;
+        if ($what == 'topic') {
+            $topic_exists = $wpdb->get_var("SELECT id FROM ".TOPIC_TABLE." WHERE id = $what_id;");
+            if ($topic_exists === NULL) {
+                wpbb_goback1('forum-index');
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('Sorry, that topic doesn\'t exist. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit();
+            }
+        } else if ($what == 'forum' || $what == 'subforum') {
+            $exists = $wpdb->get_var("SELECT id FROM ".CATEGORY_TABLE." WHERE id = $what_id;");
+            if ($exists === NULL) {
+                wpbb_goback1();
+                $type = ($what == 'subforum') ? 'subforum' : 'forum';
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('Sorry, that '.$type.' doesn\'t exist. Please try again.', 'wp-bb'); ?>
+                </div>
+                <?php
+                wpbb_exit('forum-index');
+            }
+        }
+    }
+}
+/**
+ * Displays the WPBB powered by footer if it is enabled in settings
+ *
+ *
+ * @since 1.0.2
+ *
+ *
+ */
+function wpbb_footer() {
+    $options = get_option('wpbb_options');
+    if ($options['show_footer'] == 'yes') {
+        ?>
+        <div class="wpbb-forum-footer">
+            <p>Powered by <a href="<?php echo WPBB_PLUGIN_URL; ?>">WPBB</a> <?php echo WPBB_VERSION; ?></p>
+        </div>
+        <?php
+    }
+}
+/**
+ * Checks whether the $_GET key/value pair(s) (page) exists
+ *
+ *
+ * @since 1.0.2
+ *
+ *
+ */
+function wpbb_page_exists() {
+    $allowed_get_values = array(
+        'forum', 'subforum', 'topic', 'post', 'current_page', 'action', 'create',
+        'profile', 'unread_topics', 'unanswered_topics',
+        'message', 'messages', 'view', 'delete_msg',
+        'code', 'state', 'register', 'method', 'login',
+        'page_id'
+    );
+    foreach ($_GET as $get => $value) {
+        if (!in_array($get, $allowed_get_values)) {
+            wpbb_goback1();
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('Sorry the page you requested could not be found. Please try again.', 'wp-bb'); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+    }
+}
 ?>

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

-                      r604652
+                      r607181
 $user_id = get_current_user_id();
 if (isset($_POST['wpbb-search-submit'])) {
+    wpbb_goback1('search_results', NULL);
+    if (!$user_id) {
+        wpbb_is_user_logged_in();
+        wpbb_exit();
+    }
     $search_criteria = wp_strip_all_tags($_POST['wpbb-search']);
 …
     if ($wpdb->num_rows === 0) {
+        wpbb_goback1('search-results', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
             $delete_topic_link = sprintf(__('<a href="%s">Delete</a>'), add_query_arg(array('forum' => $found->forum, 'topic' => $found->id, 'action' => 'delete'), get_permalink()));
             $status = wpbb_get_topic_status_buttons($topic->status);
+            $status = wpbb_get_topic_status_buttons($found->status);
             ?>
 …
     ?>
     <p class="wpbb-centered">
         <a href='<?php echo add_query_arg(array('profile' => $user_id), wpbb_permalink()); ?>'><?php _e('My Profile', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('unread_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unread Topics', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('unanswered_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unanswered Topics', 'wp-bb'); ?></a> |
         <a href='<?php echo add_query_arg(array('messages' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('My Messages', 'wp-bb'); ?></a>
+        <a href='<?php echo add_query_arg(array('profile' => $user_id), wpbb_permalink()); ?>'><?php _e('My Profile', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('unread_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unread Topics', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('unanswered_topics' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('Unanswered Topics', 'wp-bb'); ?></a>
+        | <a href='<?php echo add_query_arg(array('messages' => 'all', 'current_page' => 1), wpbb_permalink()); ?>'><?php _e('My Messages', 'wp-bb'); ?></a>
     </p>
 …
     // Grab all categories from the database
     $categories = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE forum = 0 AND subforum = 0 ORDER BY `order`;");
+    $categories = $wpdb->get_results("SELECT `id`, `name`, `order` FROM ".CATEGORIES_TABLE." WHERE forum = 0 AND subforum = 0 ORDER BY `order`;");
     if ($categories) {
         // Create our table
 …
             <?php
             // Grab all forums which belong to the current category
             $forums = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE forum = $category->id ORDER BY `order`;");
+            $forums = $wpdb->get_results("SELECT `id`, `name`, `description`, `order` FROM ".CATEGORIES_TABLE." WHERE forum = $category->id ORDER BY `order`;");
             if (!$forums) {
                 ?> <tr><td></td><td></td><td></td><td></td></tr><?php
 …
                         // Grab all subforums which belong to the current forum
                         if ($options['allow_subforums'] == 'yes') {
                             $subforums = $wpdb->get_results("SELECT * FROM ".CATEGORIES_TABLE." WHERE subforum = $forum->id ORDER BY `order`;");
+                            $subforums = $wpdb->get_results("SELECT `id`, `name`, `description`, `order` FROM ".CATEGORIES_TABLE." WHERE subforum = $forum->id ORDER BY `order`;");
                             if ($subforums) {
                                 _e('Subforums: ', 'wp-bb');

wp-bulletin-board/trunk/php/wpbb-message-user.php

-                      r604862
+                      r607181
 <?php
 wpbb_goback1('message-user', NULL);
+wpbb_goback1();
 if ((isset($_GET['message']))
     && (count($_GET) === 1)) {
     if (isset($_POST['wpbb-message-submit'])) {
         if (isset($_POST['wpbb-message-to'])) {
             $to_name_stripped = wp_strip_all_tags($_POST['wpbb-message-to']);
             $to_id = wpbb_parse_author_name(NULL, $to_name_stripped);
+if (isset($_POST['wpbb-message-submit'])) {
+    if (isset($_POST['wpbb-message-to'])) {
+        if (is_numeric($_POST['wpbb-message-to'])) {
+            $to_id = absint($_POST['wpbb-message-to']);
+            $to_name = wpbb_parse_author_name($to_id);
+        } else {
+            $to_name = wp_strip_all_tags($_POST['wpbb-message-to']);
+            $to_id = wpbb_parse_author_name(NULL, $to_name);
+        }
             $check_id_exists = get_user_by('id', $to_id);
+        $check_id_exists = get_user_by('id', $to_id);
+            if ($check_id_exists === false) {
+        if ($check_id_exists === false) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php
                 _e("Sorry, that user doesn't exist. Please try again", "wp-bb");
+                exit();
+            }
+                ?>
+            </div>
+            <?php
+            wpbb_exit();
+        }
+            $from = get_current_user_id();
+            // Stops an empty title from being submitted which isn't openable by the recipient without manually modifying the URL
+            /**
+            * @todo ... 1. Allow blank subjects, perhaps replacing it with another character. 2. Delay between messages
+            */
+            if (empty($_POST['wpbb-message-subject'])) {
+                _e("You must enter a subject for your message", "wp-bb");
+                exit();
+            } else {
+                $subject = wp_strip_all_tags($_POST['wpbb-message-subject']);
+            }
+            $content = wpbb_strip_tags($_POST['wpbb-message-content']);
+            $sent = date("Y-m-d H:i:s");
+            $data = array('to' => $to_id, 'from' => $from, 'subject' => $subject, 'content' => $content, 'sent' => $sent);
+            $send_message = $wpdb->insert(MESSAGES_TABLE, $data);
+            if ($send_message === false) {
+                ?>
+                <div class="wpbb-message-failure">
+                    <?php _e('There was an error sending the message. Please try again', 'wp-bb'); ?>
+                </div>
+                <?php
+            } else {
+                ?>
+                <div class="wpbb-message-success">
+                    <?php printf(__('Message to %s (%s) sent successfully.'), $to_name_stripped, $to_id); ?>
+                </div>
+                <?php
+            }
+        $from = get_current_user_id();
+        if (empty($_POST['wpbb-message-subject'])) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e("You must enter a subject for your message", "wp-bb"); ?>
+            </div>
+            <?php
+            wpbb_exit();
+        } else {
+            $subject = wp_strip_all_tags($_POST['wpbb-message-subject']);
+        }
+        $content = wpbb_strip_tags($_POST['wpbb-message-content']);
+        $sent = date("Y-m-d H:i:s");
+        $data = array('to' => $to_id, 'from' => $from, 'subject' => $subject, 'content' => $content, 'sent' => $sent);
+        $send_message = $wpdb->insert(MESSAGES_TABLE, $data);
+        if ($send_message === false) {
+            ?>
+            <div class="wpbb-message-failure">
+                <?php _e('There was an error sending the message. Please try again', 'wp-bb'); ?>
+            </div>
+            <?php
+        } else {
+            ?>
+            <div class="wpbb-message-success">
+                <?php printf(__('Message to %s (%s) sent successfully.'), $to_name, $to_id); ?>
+            </div>
+            <?php
+        }
+    }
+}
+$message_id = absint($_GET['message']);
+if ($message_id != 'to') {
     $message_id = absint($_GET['message']);
+}
+?> <h2 class="wpbb-centered-bold"><?php _e('Compose Message', 'wp-bb'); ?></h2> <?php
+    if ($message_id != 'to') {
+$message_username = wpbb_parse_author_name($message_id);
-        $message_id = absint($_GET['message']);
+    }
-    ?> <h2 class="wpbb-centered-bold"><?php _e('Compose Message', 'wp-bb'); ?></h2> <?php
-    $message_username = wpbb_parse_author_name($message_id);
-    ?>
-    <table class="wpbb-table">
-        <form method='POST' action='#'>
-            <tr>
-                <th><?php _e('To', 'wp-bb'); ?></th>
-                <td>
-                    <input type='text' name='wpbb-message-to' value='<?php echo $message_username; ?>' />
-                </td>
-            </tr>
-            <tr>
-                <th><?php _e('Subject', 'wp-bb'); ?></th>
-                <td>
-                    <input type='text' name='wpbb-message-subject' value='' />
-                </td>
-            </tr>
-            <tr>
-                <th><?php _e('Content', 'wp-bb'); ?></th>
-                <td>
-                     <?php wp_editor(" ", 'wpbb-message-content'); ?>
-                </td>
-            </tr>
-            <tr>
-                <th></th>
-                <td>
-                    <input type='submit' name='wpbb-message-submit' value='<?php _e('Send Message', 'wp-bb'); ?>' />
-                </td>
-            </tr>
-        </form>
-    </table>
-    <?php
+}
 ?>
+<table class="wpbb-table">
+    <form method='POST' action='#'>
+        <tr>
+            <th><?php _e('To', 'wp-bb'); ?></th>
+            <td>
+                <input type='text' name='wpbb-message-to' value='<?php echo $message_username; ?>' />
+            </td>
+        </tr>
+        <tr>
+            <th><?php _e('Subject', 'wp-bb'); ?></th>
+            <td>
+                <input type='text' name='wpbb-message-subject' value='' />
+            </td>
+        </tr>
+        <tr>
+            <th><?php _e('Content', 'wp-bb'); ?></th>
+            <td>
+                    <?php wp_editor("", 'wpbb-message-content'); ?>
+            </td>
+        </tr>
+        <tr>
+            <th></th>
+            <td>
+                <input type='submit' name='wpbb-message-submit' value='<?php _e('Send Message', 'wp-bb'); ?>' />
+            </td>
+        </tr>
+    </form>
+</table>
+<?php
+?>

wp-bulletin-board/trunk/php/wpbb-reply-topic.php

-                      r604652
+                      r607181
 <?php
+$user_id = get_current_user_id();
+$user_id = get_current_user_id();
 $subforum = false;
 $subforum_id = NULL;
+wpbb_goback1('reply-topic', NULL);
 …
 $topic_id = absint($_GET['topic']);
+wpbb_goback($forum_id, $subforum_id, $topic_id);
 // Check forum permissions

wp-bulletin-board/trunk/php/wpbb-unanswered-topics.php

-                      r604652
+                      r607181
 <?php
+    wpbb_goback1('unanswered_topics', NULL);
+    $user_id = get_current_user_id();
+    $user_id = wpbb_is_user_logged_in();
-    if ($user_id != 0) {
     $options = get_option('wpbb_options');
     $topics_per_page = $options['topics_per_page'];
 …
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE created = last_reply;");
     $topics = false;
     if ($total_topics > 0) {
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
         wpbb_pagination(NULL, $current_page, $start, $limit, $total_topics, $topics_per_page);
+        $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE created = last_reply ORDER by created DESC LIMIT $start, $limit;");
+    } else {
         $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE created = last_reply ORDER by created DESC LIMIT $start, $limit;");
+    }
     if ($topics) {
+        wpbb_goback1('unanswered_topics', NULL);
         ?>
         <h3 class="wpbb-centered-bold"><?php _e('Unanswered Topics', 'wp-bb'); ?></h3>
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold"><?php _e('Unanswered Topics', 'wp-bb'); ?></h1>
         <table class="wpbb-table">
             <th><?php _e('Status', 'wp-bb'); ?></th>
 …
             ?> </table> <?php
         } else {
+            wpbb_goback1('unanswered_topics', NULL);
             ?>
             <div class="wpbb-centered-bold">
+            <div class="wpbb-message-failure">
                 <?php _e('There are no unanswered topics at this time.', 'wp-bb'); ?>
             </div>
 …
+        }
-        } else {
-            ?>
-            <div class="wpbb-centered-bold">
-                <?php _e('Please register or login to view this page', 'wp-bb'); ?>
-            </div>
-            <?php
+        }
 ?>

wp-bulletin-board/trunk/php/wpbb-unread-topics.php

-                      r604652
+                      r607181
 <?php
-    // Display go back link
-     wpbb_goback1('unread-topics', NULL);
      // Returns user ID
      $user_id = get_current_user_id();
+     $user_id = wpbb_is_user_logged_in();
-     if ($user_id != 0) {
         $user_lastvisit = get_user_meta($user_id, 'wpbb_lastvisit', true);
 …
+            }
+        }
         $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE last_reply = '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0;");
+        $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0;");
         $topics = false;
         if ($total_topics > 0) {
+        if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
             wpbb_pagination(NULL, $current_page, $start, $limit, $total_topics, $topics_per_page);
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply = '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+        } else {
+            $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE last_reply > '$user_lastvisit' AND last_reply < '$user_currentvisit' AND `read` = 0 ORDER by last_reply DESC LIMIT $start, $limit;");
+        }
         if ($topics) {
+            wpbb_goback1('unread-topics', NULL);
             ?>
             <h3 class="wpbb-centered-bold">
+            <h1 id="wpbb-h-1" class="wpbb-centered-bold">
                 <?php _e('Unread Topics Since Last Visit', 'wp-bb'); ?>
             </h3>
+            </h1>
             <table class="wpbb-table">
                 <th><?php _e('Status', 'wp-bb'); ?></th>
 …
                     $status = wpbb_get_topic_status_buttons($topic->status);
+                    $freshness = wpbb_get_topic_freshness($topic_last_post);
                     ?>
 …
                         <td>
+                            <?php
+                            <?php
+                            echo $freshness;
                             if ($status['locked'] != "") {
                                 echo $status['locked'];
 …
             <?php
         } else {
+            wpbb_goback1('unread-topics', NULL);
             ?>
             <div class="wpbb-centered-bold">
+            <div class="wpbb-message-failure">
                 <?php _e('There are no unread topics at this time', 'wp-bb'); ?>
             </div>
 …
+        }
+    } else {
+        ?>
+        <div class="wpbb-centered-bold">
+            <?php _e('Please register or login to view this page', 'wp-bb'); ?>
+        </div>
+        <?php
+    }
 ?>

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

-                      r604652
+                      r607181
 <?php
+    $topic_id = absint($_GET['topic']);
+    wpbb_check_exists('topic', $topic_id);
     $user_id = get_current_user_id();
     $forum = absint($_GET['forum']);
 …
+    }
     $topic_id = absint($_GET['topic']);
     $topic_status = wpbb_get_topic_status($topic_id);
 …
             $topic_id = absint($_GET['topic']);
             $total_posts = $wpdb->get_var("SELECT COUNT(*) as 'Posts' FROM ".POST_TABLE." WHERE topic = $topic->id;");
+            wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+            if (($total_posts > 0) && ($total_posts > $posts_per_page)) {
+                wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+            }
             wpbb_buttons($forum, NULL, $topic_id, 'forum_topic');
             $user_posts = get_user_meta($topic->author, 'wpbb_posts', true);
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature">
                                 <?php echo $signature; ?>
+                                <?php echo convert_smilies($signature); ?>
                             </p>
                         </td>
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature"</p>
                             <?php echo $signature; ?>
+                            <?php echo convert_smilies($signature); ?>
                         </td>
                     </tr>
 …
             <div class="wpbb-quick-reply">
                 <form action='#' method='POST'>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td><textarea name='wpbb-quick-reply-content'></textarea></td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <div>
+                        <?php _e('Content', 'wp-bb'); ?>
+                    </div>
+                    <div>
+                        <textarea name='wpbb-quick-reply-content'></textarea>
+                    </div>
+                    <div>
+                        <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                    </div>
                 </form>
             </div>

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

-                      r604652
+                      r607181
     $forum = absint($_GET['forum']);
+    wpbb_check_exists('forum', $forum);
     $user_id = get_current_user_id();
 …
     $view_permissions = wpbb_user_has_permission($user_id, $forum);
     if ($view_permissions === false) {
         wpbb_goback1('forum_denied', NULL);
+        wpbb_goback1('forum-index', NULL);
         ?>
         <div class="wpbb-message-failure">
 …
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE forum = $forum;");
     $topics = false;
     if ($total_topics > 0) {
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
         wpbb_pagination($forum, $current_page, $start, $limit, $total_topics, $topics_per_page);
-        $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE."  WHERE forum = $forum ORDER BY FIELD(status, 'sticky', 'locked,sticky') DESC, last_reply DESC LIMIT $start, $limit;");
+    }
+    $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE."  WHERE forum = $forum ORDER BY FIELD(status, 'sticky', 'locked,sticky') DESC, last_reply DESC LIMIT $start, $limit;");
     wpbb_buttons($forum, NULL, NULL, 'forum');
     // If 'sticky' is found in the set field, order by that first otherwise order by last_reply descending.

wp-bulletin-board/trunk/php/wpbb-view-message.php

-                      r604862
+                      r607181
     ?>
     <table class="wpbb-table">
+    <?php
+        <th><?php _e('From', 'wp-bb'); ?></th>
+        <th><?php _e('Message', 'wp-bb'); ?></th>
+        <?php
         foreach ($get_message as $message) {
             // Mark message as read
 …
+            }
             $message_from_name = wpbb_parse_author_name($message->from);
+            $message_from_avatar = get_avatar($message->from);
+            $signature = get_user_meta($message->from, 'wpbb_signature', true);
+            $reply_to_message = "<a href=".add_query_arg(array('message' => $message->from), wpbb_permalink()).">".__('Reply', 'wp-bb')."</a>";
+            $delete_message = "<a href=".add_query_arg(array('messages' => 'all', 'delete_msg' => $message->id), wpbb_permalink()).">".__('Delete', 'wp-bb')."</a>";
             ?>
             <tr>
+                <th><?php _e('From', 'wp-bb'); ?></th>
+                <td><?php echo $message_from_name; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Sent', 'wp-bb'); ?></th>
+                <td><?php echo $message->sent; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Subject', 'wp-bb'); ?></th>
+                <td><?php echo $message->subject; ?></td>
+            </tr>
+            <tr>
+                <th><?php _e('Content', 'wp-bb'); ?></th>
+                <td><?php echo $message->content; ?></td>
+                <td class="wpbb-topic-profile">
+                    <a href='<?php echo add_query_arg(array('profile' => $message->from), wpbb_permalink()); ?>'>
+                        <?php echo $message_from_name; ?>
+                    </a>
+                    <br /><?php echo $message_from_avatar; ?>
+                </td>
+                <td>
+                    <p class="wpbb-message-subject-date">
+                        <strong><?php printf(__('( Subject: %s )'), $message->subject); ?></strong>
+                        <?php echo  $message->sent . " " . $reply_to_message . " " . $delete_message; ?>
+                    </p>
+                    <p class="wpbb-topic-and-post-content">
+                        <?php echo convert_smilies($message->content); ?>
+                    </p>
+                    <hr>
+                    <p class="wpbb-topic-and-post-signature">
+                        <?php echo convert_smilies($signature); ?>
+                    </p>
+                </td>
             </tr>
             <?php

wp-bulletin-board/trunk/php/wpbb-view-profile.php

-                      r604652
+                      r607181
 <?php
+$user_id = wpbb_is_user_logged_in();
 /*
     Viewing a Profile
 */
-    wpbb_goback1('view-profile', NULL);
     $profile_id = absint($_GET['profile']);
 …
         ?>
         <div class="wpbb-centered-bold">
             <?php _e('Please register or login to access this page', 'wp-bb'); ?>
+            <?php printf(__('You must <a href="%s">Login</a> or <a href="%s">Register</a> to be able to view the forum!'), wp_login_url(), site_url('wp-login.php?action=register')); ?>
         </div>
         <?php
 …
+    }
+    if ($profile_id == get_current_user_id()) {
+    wpbb_goback1();
+    if ($profile_id == $user_id) {
         ?>
         <h3 class="wpbb-centered-bold">
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold">
             <?php _e('My Profile', 'wp-bb'); ?>
         </h3>
+        </h1>
         <?php
     } else {
         ?>
         <h3 class="wpbb-centered-bold">
+        <h1 id="wpbb-h-1" class="wpbb-centered-bold">
             <?php printf(__('Viewing %s\'s Profile'), $user->display_name); ?>
         </h3>
+        </h1>
         <?php
+    }
 …
         <div class="clear"></div>
         <table id="wpbb-profile-signature">
             <form method='POST' action='#'>
                 <th><h2><?php _e('Signature', 'wp-bb'); ?></h2></th>
                 <tr><td><textarea name='wpbb-signature'><?php echo $signature; ?></textarea></td></tr>
                 <tr><td><input type='submit' name='wpbb-signature-submit' value='<?php _e('Save Signature', 'wp-bb'); ?>' />
+        <div id="wpbb-profile-signature">
+            <form method="POST" action="#">
+                <div>
+                    <h2><?php _e('Signature', 'wp-bb'); ?></h2>
+                </div>
+                <div>
+                    <textarea name="wpbb-signature"><?php echo $signature; ?></textarea>
+                </div>
+                <div>
+                    <input type="submit" name="wpbb-signature-submit" value="<?php _e('Save Signature', 'wp-bb'); ?>" />
+                </div>
             </form>
         </table>
+        </div>
         <?php
+    }

wp-bulletin-board/trunk/php/wpbb-view-subforum-topic.php

-                      r604652
+                      r607181
     $topic_id = absint($_GET['topic']);
+    wpbb_check_exists('topic', $topic_id);
     // Third parameter is 'view' by default
 …
                 $forum = absint($_GET['forum']);
                 $total_posts = $wpdb->get_var("SELECT COUNT(*) as 'Posts' FROM ".POST_TABLE." WHERE topic = $topic->id;");
+                wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+                if (($total_posts > 0) && ($total_posts > $posts_per_page)) {
+                    wpbb_pagination($forum, $current_page, $start, $limit, $total_posts, $posts_per_page, false);
+                }
                 wpbb_buttons($forum, $subforum, $topic_id, 'subforum_topic');
                 if ($current_page == 1) {
 …
                             <hr>
                             <p class="wpbb-topic-and-post-signature">
                                 <?php echo $signature; ?>
+                                <?php echo convert_smilies($signature); ?>
                             </p>
                         </td>
 …
                                 <hr>
                                 <p class="wpbb-topic-and-post-signature">
                                     <?php echo $signature; ?>
+                                    <?php echo convert_smilies($signature); ?>
                                 </p>
                             </td>
 …
             <div class="wpbb-quick-reply">
                 <form action='#' method='POST'>
+                    <tr>
+                        <th><?php _e('Content', 'wp-bb'); ?></th>
+                        <td><textarea name='wpbb-quick-reply-content'></textarea></td>
+                    </tr>
+                    <tr>
+                        <th></th>
+                        <td>
+                            <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                        </td>
+                    </tr>
+                    <div>
+                        <?php _e('Content', 'wp-bb'); ?>
+                    </div>
+                    <div>
+                        <textarea name='wpbb-quick-reply-content'></textarea>
+                    </div>
+                    <div>
+                        <input type='submit' name='wpbb-quick-reply-submit' value='<?php _e('Quick Reply', 'wp-bb'); ?>' />
+                    </div>
                 </form>
             </div>

wp-bulletin-board/trunk/php/wpbb-view-subforum.php

-                      r604652
+                      r607181
     $forum = absint($_GET['forum']);
+    $subforum = absint($_GET['subforum']);
+    wpbb_check_exists('subforum', $subforum);
     $view_permissions = wpbb_user_has_permission($user_id, $forum);
     if ($view_permissions === false) {
 …
         wpbb_exit();
     } else {
-        $subforum = absint($_GET['subforum']);
         $view_permissions = wpbb_user_has_permission($user_id, $subforum);
         if ($view_permissions === false) {
 …
+    }
     $total_topics = $wpdb->get_var("SELECT COUNT(*) as 'Topics' FROM ".TOPIC_TABLE." WHERE subforum = $subforum;");
-    wpbb_pagination($subforum, $current_page, $start, $limit, $total_topics, $topics_per_page);
     wpbb_buttons($forum, $subforum, NULL, 'subforum');
+    // End of pagination
+    if (($total_topics > 0) && ($total_topics > $topics_per_page)) {
+        wpbb_pagination($subforum, $current_page, $start, $limit, $total_topics, $topics_per_page);
+    }
     $topics = $wpdb->get_results("SELECT * FROM ".TOPIC_TABLE." WHERE subforum = $subforum ORDER BY created DESC LIMIT $start, $limit;");
     if ($topics) {

wp-bulletin-board/trunk/readme.txt

-                      r604655
+                      r607181
 Requires at least: 3.3
 Tested up to: 3.4.2
 Stable tag: 1.0.1
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 1.0.2 =
+* Fixed pagination from displaying when there is only 1 page
+* Fixed being able to view or post to non-existent forums/subforums/topics
+* View message layout now resembles view topic / post layout with some adjustments
+* Ability to reply to a message from the view message page
+* Fixed smilies from not displaying correctly in topic, post, profile and messages signature
+* Signature textarea is now more consistent across different themes
+* Fixed topics status from displaying incorrectly when editing a topic
+* Facebook and Twitter are disabled by default to prevent error messages
+* Fixed compose message link under default permalinks
+* Fixed delete message link
+* Fixed inability to use ID when editing topic, post author and when composing a message.
+* Improved maintenance message and reminder styling.
+* Updated links on FAQ & Support
+* You can now choose the default role a new facebook registration has in your settings
+* Fixed registering facebook accounts if registration is disabled
 = 1.0.1 =
+* Minor bug fixes
+* Fixed broken view message link
+* Fixed table layout when a category doesn't have any forums
 * Fixed broken link in message which is displayed to logged out users
 * Fixed some layout issues due to CSS files not loading early enough, also added some css options for links and changed default visited link colour to blue

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

-                      r604665
+                      r607181
 <?php
 /*
     Plugin Name: wp-bb
     Plugin URI: http://codebycarter.com
+    Plugin Name: WPBB
+    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.1
+    Version: 1.0.2
     Author: Jay Carter
     Author URI: http://codebycarter.com
 …
 define('MESSAGE_TABLE', $wpdb->prefix.'wpbb_messages');
 // Define current version
+define('WPBB_VERSION', 'v1.0.0');
+define('WPBB_VERSION', 'v1.0.2');
+// Define plugin url (wp plugin page)
+define('WPBB_PLUGIN_URL', 'http://wordpress.org/support/plugin/wp-bulletin-board');
 /*
 …
 add_action('switch_theme', 'wpbb_create_template_file');
 add_action('wp_enqueue_scripts', 'wpbb_register_styles');
+/*add_action('init', 'wpbb_setup_rewrite_rules');
+add_action('init', 'wpbb_setup_rewrite_tags');
+function wpbb_setup_rewrite_rules() {
+    add_rewrite_rule('forum(/([^\d]+))?', 'index.php/forums/?forum=$1', 'top');
+}
+function wpbb_setup_rewrite_tags() {
+    global $wp;
+    $wp->add_query_var('forum');
+}*/
+/*
+    Could've used this, overwritten _http_build_query to set the value seperator to / aswell, but its not pluggable or hookable.
+*/
+//var_dump(_http_build_query(array('forum', 'page'), null, '/', '/', false));
+function wpbb_setup_rewrite_rules() {
+    //add_rewrite_rule('carpage(/([^/]+))?(/([^/]+))?/?','index.php?pagename=carpage&var1=$matches[2]&var2=$matches[4]','top');
+}
+add_action('init', 'wpbb_setup_rewrite_rules');
 /*
 …
             'post_cutoff' => 15,
             'post_to_forum' => 'yes',
+            'show_footer' => 'no',
+            'version' => WPBB_VERSION
+            'show_footer' => 'no'
         );
         $add_wpbb_options = add_option('wpbb_options', $options);
 …
         $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' => 'yes',
+            '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_state' => $facebook_state,
+            'facebook_default_role' => $facebook_role
         );
         $add_wpbb_facebook_options = add_option('wpbb_facebook_options', $facebook_options);
 …
         $twitter_account = __('Enter your website/personal Twitter Account', 'wp-bb');
         $twitter_options = array(
             'allow_twitter' => 'yes',
+            'allow_twitter' => 'no',
             'twitter_account' => $twitter_account
         );
 …
     $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 = __('Forum', 'wp-bb');
+        $wpbb_page_title = __('Forums', 'wp-bb');
         $link = site_url().'/'.strtolower($wpbb_page_title);
         $page = array(

Context Navigation

Legend:

Download in other formats: