Changeset 734

Timestamp:

03/02/07 11:21:43 (2 years ago)

Author:

mdawaffe

Message:

forum hierarchy interface. nothing for the front end yet. Very preliminary

Files:

• trunk/bb-admin/admin-ajax.php (modified) (2 diffs)
• trunk/bb-admin/admin-functions.php (modified) (1 diff)
• trunk/bb-admin/bb-forum.php (modified) (2 diffs)
• trunk/bb-admin/content-forums.php (modified) (4 diffs)
• trunk/bb-admin/js (added)
• trunk/bb-admin/js/content-forums.js (added)
• trunk/bb-admin/style.css (modified) (4 diffs)
• trunk/bb-admin/upgrade-schema.php (modified) (1 diff)
• trunk/bb-includes/cache.php (modified) (7 diffs)
• trunk/bb-includes/functions.php (modified) (4 diffs)
• trunk/bb-includes/js/add-load-event.js (added)
• trunk/bb-includes/js/jquery (added)
• trunk/bb-includes/js/jquery/interface.js (added)
• trunk/bb-includes/js/jquery/jquery.js (added)
• trunk/bb-includes/js/list-manipulation-js.php (modified) (1 diff)
• trunk/bb-includes/script-loader.php (modified) (1 diff)
• trunk/bb-includes/template-functions.php (modified) (3 diffs)
• trunk/bb-templates/kakumei/header.php (modified) (1 diff)

trunk/bb-admin/admin-ajax.php

@@ -1 +1 @@
-<?php
-require_once('../bb-load.php');
-
+
-bb_check_ajax_referer();
-
-if ( !$bb_current_id = bb_get_current_user_info( 'id' ) )
-        die('-1');
+
-define('DOING_AJAX', true);
-
@@ -149 +150 @@
-        break;
-
+case 'add-forum' :
+        if ( !bb_current_user_can( 'manage_forums' ) )
+                die('-1');
+
+        if ( !$forum_id = bb_new_forum( $_POST ) )
+                die('0');
+
+        global $forums_count;
+        $forums_count = 2; // Hack
+
+        $x = new WP_Ajax_Response( array(
+                'what' => 'forum',
+                'id' => $forum_id,
+                'data' => bb_forum_row( $forum_id, false )
+        ) );
+        $x->send();
+        break;
+
+case 'order-forums' :
+        if ( !is_array($_POST['order']) )
+                die('0');
+
+        global $bbdb;
+
+        $forums = array();
+
+        get_forums(); // cache
+
+        foreach ( $_POST['order'] as $pos => $forum_id ) :
+                $forum = $bbdb->escape_deep( get_object_vars( get_forum( $forum_id ) ) );
+                $forum['forum_order'] = $pos;
+                $forums[(int) $forum_id] = $forum;
+        endforeach;
+
+        foreach ( $_POST['root'] as $root => $ids )
+                foreach ( $ids as $forum_id )
+                        $forums[(int) $forum_id]['forum_parent'] = (int) $root;
+
+        foreach ( $forums as $forum )
+                bb_update_forum( $forum );
+
+
+        die('1');
+        break;
+
-default :
-        do_action( 'bb_ajax_' . $_POST['action'] );

trunk/bb-admin/admin-functions.php

@@ -525 +525 @@
-}
-
+function bb_forum_row( $forum_id = 0, $echo = true, $close = true, $class = 'forum' ) {
+        global $forum, $forums_count;
+        if ( $forum_id )
+                $_forum = get_forum( $forum_id );
+        else
+                $_forum =& $forum;
+
+        if ( !$_forum )
+                return;
+
+        $r  = "\t<li id='forum-$_forum->forum_id'" . get_alt_class( 'forum', "$class clear list-block" ) . ">\n";
+        $r .= "\t\t<div class='list-block posrel'>" . get_forum_name( $_forum->forum_id ) . ' &#8212; ' . get_forum_description( $_forum->forum_id ) . "\n";
+        $r .= "\t\t\t<div class='abstop absright'>\n";
+        if ( bb_current_user_can( 'manage_forums' ) )
+                $r .= "\t\t\t\t<a class='edit' href='" . attribute_escape( bb_get_option('uri') . "bb-admin/content-forums.php?action=edit&id=$_forum->forum_id" ) . "'>" . __('Edit') . "</a>\n";
+        if ( bb_current_user_can( 'delete_forum', $_forum->forum_id ) && 1 < $forums_count )
+                $r .= "\t\t\t\t<a class='delete' href='" . attribute_escape( bb_get_option('uri') . "bb-admin/content-forums.php?action=delete&id=$_forum->forum_id" ) . "'>" . __('Delete') . "</a>\n";
+        $r .= "\t\t\t</div>\n\t\t</div>\n";
+        if ( $close )
+                $r .= "\t</li>\n";
+
+        if ( $echo )
+                echo $r;
+        return $r;
+}
+
+function bb_forum_form( $forum_id = 0 ) {
+        $forum_id = (int) $forum_id;
+        if ( $forum_id && !$forum = get_forum( $forum_id ) )
+                return;
+        $action = $forum_id ? 'update' : 'add';
-?>
+<form method="post" id="<?php echo $action; ?>-forum" action="<?php bb_option('uri'); ?>bb-admin/bb-forum.php">
+        <fieldset>
+        <table><col /><col style="width: 80%" />
+                <tr><th scope="row"><?php _e('Forum Name:'); ?></th>
+                        <td><input type="text" name="forum_name" id="forum-name" value="<?php if ( $forum_id ) echo attribute_escape( get_forum_name( $forum_id ) ); ?>" tabindex="10" class="widefat" /></td>
+                </tr>
+                <tr><th scope="row"><?php _e('Forum Description:'); ?></th>
+                        <td><input type="text" name="forum_desc" id="forum-desc" value="<?php if ( $forum_id ) echo attribute_escape( get_forum_description( $forum_id ) ); ?>" tabindex="11" class="widefat" /></td>
+                </tr>
+                <tr><th scope="row"><?php _e('Forum Parent:'); ?></th>
+                        <td><?php bb_forum_dropdown( array('callback' => 'strcmp', 'callback_args' => array($forum_id), 'id' => 'forum_parent', 'none' => true, 'selected' => $forum_id ? get_forum_parent( $forum_id ) : 0) ); ?></td>
+                </tr>
+                <tr><th scope="row"><?php _e('Position:'); ?></th>
+                        <td><input type="text" name="forum_order" id="forum-order" value="<?php if ( $forum_id ) echo get_forum_position( $forum_id ); ?>" tabindex="12" maxlength="10" class="widefat" /></td>
+                </tr>
+        </table>
+        <p class="submit">
+<?php if ( $forum_id ) : ?>
+                <input type="hidden" name="forum_id" value="<?php echo $forum_id; ?>" />
+<?php endif; ?>
+                <?php bb_nonce_field( "$action-forum" ); ?>
+
+                <input type="hidden" name="action" value="<?php echo $action; ?>" />
+                <input name="Submit" type="submit" value="<?php if ( $forum_id ) _e('Update Forum &#187;'); else _e('Add Forum &#187;'); ?>" tabindex="13" />
+        </p>
+        </fieldset> 
+</form>
+<?php
+}
+
+?>

trunk/bb-admin/bb-forum.php

@@ -12 +12 @@
-switch ( $_POST['action'] ) :
-case 'add' :
-']) || '' === $_POST['forum
+_name']) || '' === $_POST['forum_name
-                bb_die(__('Bad forum name.  Go back and try again.'));
-
-        bb_check_admin_referer( 'add-forum' );
-
-
-
-
-
+
-                wp_redirect( $sent_from );
-                exit;
@@ -28 +25 @@
-        break;
-case 'update' :
-s
+
-
-        if ( !$forums = get_forums() )
-                bb_die(__('No forums to update!'));
-foreach ( $forums as $forum ) :
-if ( isset($_POST['name-' . $forum->forum_id]) && '' !== $_POST['name-' . $forum->forum_id] )
-               bb_update_forum( $forum->forum_id, $_POST['name-' . $forum->forum_id], $_POST['desc-' . $forum->forum_id], $_POST['order-' . $forum->forum_id]);
-endforeach
-$sent_from
+if ( (int) $_POST['forum_id'] && isset($_POST['forum_name']) && '' !== $_POST['forum_name'] )
+bb_update_forum( $_POST );
+foreach ( array('action', 'id') as $arg )
+       $sent_from = remove_query_arg( $arg, $sent_from )
+add_query_arg( 'message', 'updated', $sent_from )
-        exit;
-        break;

trunk/bb-admin/content-forums.php

@@ -14 +14 @@
-if ( isset($_GET['message']) ) {
-        switch ( $_GET['message'] ) :
+        case 'updated' :
+                bb_admin_notice( __('Forum Updated.') );
+                break;
-        case 'deleted' :
-                bb_admin_notice( sprintf(__('Forum deleted.  You should have bbPress <a href="%s">recount your site information</a>.'), bb_get_option( 'uri' ) . 'bb-admin/site.php') );
@@ -20 +23 @@
-}
-
+if ( !isset($_GET['action']) )
+        bb_enqueue_script( 'content-forums' );
+
-bb_get_admin_header();
-?>
-
-<h2><?php _e('Forum Management'); ?></h2>
-
+
+
+
+
+
-<div class="ays narrow">
-        <p><big><?php printf(__('Are you sure you want to delete the "<strong>%s</strong>" forum?'), $deleted_forum->forum_name); ?></big></p>
@@ -37 +47 @@
-                        <label for="move-topics-delete"><input type="radio" name="move_topics" id="move-topics-delete" value="delete" /> <?php _e('Delete all topics and posts in this forum. <em>This can never be undone.</em>'); ?></label><br />
-                        <label for="move-topics-move"><input type="radio" name="move_topics" id="move-topics-move" value="move" checked="checked" /> <?php _e('Move topics from this forum into'); ?></label>
-
+ 'strcmp', array($deleted_forum->forum_id) 
-                        <select name="move_topics_forum" id="move-topics-forum">
-
-
-
-
-
-
+
+
+
-                        </select>
-                        
@@ -61 +68 @@
-        </form>
-</div>
-else: // action
+break; default :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php endif; // $forums ?>
-
-
+
+
+
+
+
+
-
-<?php bb_get_admin_footer(); ?>

trunk/bb-admin/style.css

@@ +1 @@
+.helper { border: 2px dashed #777; }
+
+.sort-handle { cursor: move; }
+
-a {
-        border-bottom: 1px solid #6c9;
@@ -15 +19 @@
-}
-
+ul.list-block {
+        margin: 0;
+        padding: 0;
+        background-color: #fff;
+}
+
+ul.list-block ul.list-block {
+        padding: 0 0 0 4ex;
+}
+
+li.list-block {
+        list-style: none;
+        margin: 0;
+        padding: 8px 0 0;
+}
+
+.absright {
+        position: absolute;
+        right: 0;
+}
+
+.abstop {
+        position: absolute;
+        top: 0;
+}
+
+.posrel {
+        position: relative;
+}
+
+div.list-block {
+        padding: 0 8px 8px;
+}
+
-a.edit, a.delete, a.edit:hover, a.delete:hover {
+        padding: 5px;
-        border-bottom: none;
-        display: block;
-        padding: 5px 0;
-        text-align: center;
-}
@@ -247 +284 @@
-
-thead, .thead {
-
+
+
-}
-
@@ -418 +456 @@
-}
-
+.clear {
+        clear: both;
+}
+
-br.clear {
-        clear: both;
-        height: 1px;
-        font-size: 1px;

trunk/bb-admin/upgrade-schema.php

@@ -6 +6 @@
-  forum_name varchar(150)  NOT NULL default '',
-  forum_desc text  NOT NULL,
+  forum_parent int(10) NOT NULL default '0',
-  forum_order int(10) NOT NULL default '0',
-  topics bigint(20) NOT NULL default '0',

trunk/bb-includes/cache.php

@@ -139 +139 @@
-
-        function get_forums() {
-
+, $bb_forum_cache
-
-                $normal = true;
-                if ( '' != $where = apply_filters('get_forums_where', '') )
-                        $normal = false;
+
+                if ( $normal && isset($bb_forum_cache[-1]) && $bb_forum_cache[-1] ) {
+                        $forums = $bb_forum_cache;
+                        unset($forums[-1]);
+                        return $forums;
+                }
-
-                if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_forums') )
@@ -151 +157 @@
-                if ( $this->use_cache && $normal && $forums )
-                        $this->write_cache(BBPATH . 'bb-cache/bb_forums', $forums);
+                foreach ( $forums as $forum )
+                        $bb_forum_cache[(int) $forum->forum_id] = $forum;
+
+                $bb_forum_cache[-1] = true;
+
-                return $forums;
-        }
-
-        function get_forum( $forum_id ) {
-
+, $bb_forum_cache
-                $forum_id = (int) $forum_id;
-
@@ -161 +172 @@
-                if ( '' != $where = apply_filters('get_forum_where', '') )
-                        $normal = false;
+
+                if ( $normal && $forum_id && isset($bb_forum_cache[$forum_id]) )
+                        return $bb_forum_cache[$forum_id];
-
-                if ( $this->use_cache && $normal && file_exists(BBPATH . 'bb-cache/bb_forum-' . $forum_id) )
-                        return $this->read_cache(BBPATH . 'bb-cache/bb_forum-' . $forum_id);
-
-
+
+
+
-                if ( $this->use_cache && $normal && $forum )
-                        $this->write_cache(BBPATH . 'bb-cache/bb_forum-' . $forum_id, $forum);
+
-                return $forum;
-        }
@@ -187 +204 @@
-
-        function flush_one( $type, $id = 0, $page = 0 ) {
-                if ( !$this->use_cache )
-                        return;
-                switch ( $type ) :
-                case 'user' :
@@ -197 +212 @@
-                        break;
-                case 'forums' :
+                        global $bb_forum_cache;
+                        unset($bb_forum_cache[-1]);
-                        $file = BBPATH . 'bb-cache/bb_forums';
-                        break;
-                endswitch;
+
+                if ( !$this->use_cache )
+                        return;
-
-                if ( file_exists($file) )
@@ -206 +226 @@
-
-        function flush_many( $type, $id, $start = 0 ) {
-                if ( !$this->use_cache )
-                        return;
-                switch ( $type ) :
-                case 'thread' :
@@ -213 +231 @@
-                        break;
-                case 'forum' :
+                        global $bb_forum_cache;
+                        unset($bb_forum_cache[$id], $bb_forum_cache[-1]);
-                        $files = array(BBPATH . 'bb-cache/bb_forum-' . $id, BBPATH . 'bb-cache/bb_forums');
-                        break;
-                endswitch;
+
+                if ( !$this->use_cache )
+                        return;
-
-                if ( is_array($files) )

trunk/bb-includes/functions.php

@@ -1 +1 @@
-<?php
+
+function bb_get_forums_hierarchical( $root = 0, $old_root = 0, $leaves = false ) {
+        static $tree = 0;
+
+        $root = (int) $root;
+
+        if ( 0 !== $tree )
+                return $tree;
+
+        $_recursed = (bool) $leaves;
+
+        if ( false === $leaves )
+                $leaves = get_forums();
+
+        if ( !$leaves )
+                return false;
+
+        $branch = array();
+
+        foreach ( $leaves as $l => $leaf ) {
+                if ( $root == $leaf->forum_parent ) {
+                        $new_root = (int) $leaf->forum_id;
+                        unset($leaves[$l]);
+                        $branch[$new_root] = bb_get_forums_hierarchical( $new_root, $root, $leaves );
+                }
+        }
+
+        if ( !$_recursed )
+                return $tree = empty($branch) ? false : $branch;
+
+        return $branch ? $branch : true;
+}
-
-function get_forums( $callback = false, $callback_args = false ) {
@@ -470 +502 @@
-                break;
-        case 'bb_db_version' :
-688
+700
-                break;
-        case 'html_type' :
@@ -852 +884 @@
-
-
-name, $desc, $order = 0
+args
-        global $bbdb, $bb_cache;
-        if ( !bb_current_user_can( 'manage_forums' ) )
-                return false;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $bb_cache->flush_one( 'forums' );
-        return $bbdb->insert_id;
-}
-
-forum_id, $name, $desc, $order = 0
+args
-        global $bbdb, $bb_cache;
-        if ( !bb_current_user_can( 'manage_forums' ) )
-                return false;
+
+        $defaults = array( 'forum_id' => 0, 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => 0 );
+        $args = bb_parse_args( $args, $defaults );
+        if ( 1 < func_num_args() ) : // For back compat
+                $args['forum_name']  = func_get_arg(0);
+                $args['forum_desc']  = func_get_arg(1);
+                $args['forum_order'] = 2 < func_num_args() ? func_get_arg(2) : 0;
+        endif;
+
+        extract($args);
+
-        if ( !$forum_id = (int) $forum_id )
-                return false;
-
-
+
+
+
-                return false;
-        $bb_cache->flush_many( 'forum', $forum_id );
-
+
+
-}
-
@@ -900 +962 @@
-
-        $bb_cache->flush_many( 'forum', $forum_id );
+        $bb_cache->flush_one( 'forums' );
-        return $return;
-}

trunk/bb-includes/js/list-manipulation-js.php

@@ -117 +117 @@
-                var id = this.topAdder ? this.theList.firstChild.id : this.theList.lastChild.id;
-                if ( this.alt )
-this.theList.childNodes.length
+( this.theList.childNodes.length + this.altOffset )
-                                $(id).addClassName(this.alt);
-                Fat.fade_element(id);

trunk/bb-includes/script-loader.php

@@ -11 +11 @@
-
-        function default_scripts() {
-false
+array('add-load-event')
-                $this->add( 'prototype', '/' . BBINC . 'js/prototype.js', false, '1.5.0' );
-                $this->add( 'wp-ajax', '/' . BBINC . 'js/wp-ajax-js.php', array('prototype'), '2.1-beta2' );
-
-
+
+
+
+
+
+
-        }
-

trunk/bb-includes/template-functions.php

@@ -374 +374 @@
-        global $forum;
-        if ( $forum_id )
-
-
+
+
+
+
-}
-
@@ -394 +396 @@
-        global $forum;
-        if ( $forum_id )
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1575 +1597 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        global $forum_id;
-        if ( !$forums = get_forums( $callback, $callback_args ) )
-                return;
-
-
+
+
+
+
+
+
-
-        foreach ( $forums as $forum ) :
-selected = ( $forum_i
-<option value='$forum->forum_id'$selected>$forum->forum_name</option>
+_selected = ( !$selected && $forum_id == $forum->forum_id || $selecte
+\n<option value='$forum->forum_id'$_selected>$forum->forum_name</option>\n
-        endforeach;
-'</select>'
+"</select>\n"
-        return $r;
-}

trunk/bb-templates/kakumei/header.php

@@ -12 +12 @@
-<?php if ( is_topic() && bb_is_user_logged_in() ) : ?>
-        <script type="text/javascript">
-                function addLoadEvent(func) {
-                        var oldonload = window.onload;
-                        if (typeof window.onload != 'function') {
-                                window.onload = func;
-                        } else {
-                                window.onload = function() {
-                                        oldonload();
-                                        func();
-                                }
-                        }
-                }
-
-                var lastMod = <?php topic_time( 'timestamp' ); ?>;
-                var page = <?php global $page; echo $page; ?>;