Changeset 1671

Timestamp:

08/27/08 22:32:37 (3 months ago)

Author:

mdawaffe

Message:

PHP Notice and HTML Validation fixes

Files:

• trunk/bb-admin/admin-functions.php (modified) (5 diffs)
• trunk/bb-admin/content-posts.php (modified) (1 diff)
• trunk/bb-admin/options-general.php (modified) (7 diffs)
• trunk/bb-admin/options-wordpress.php (modified) (5 diffs)
• trunk/bb-admin/themes.php (modified) (1 diff)
• trunk/bb-admin/users-blocked.php (modified) (1 diff)
• trunk/bb-admin/users-moderators.php (modified) (1 diff)
• trunk/bb-admin/users.php (modified) (1 diff)
• trunk/bb-includes/class-bb-taxonomy.php (modified) (1 diff)
• trunk/bb-includes/classes.php (modified) (8 diffs)
• trunk/bb-includes/default-filters.php (modified) (1 diff)
• trunk/bb-includes/functions.php (modified) (8 diffs)
• trunk/bb-includes/template-functions.php (modified) (17 diffs)

trunk/bb-admin/admin-functions.php

@@ -176 +176 @@
-        global $bb_current_menu, $bb_current_submenu;
-        $title = bb_get_option('name') . ' › ' . $bb_current_menu[0] . ( $bb_current_submenu ? ' » ' . $bb_current_submenu[0] : '' ) . ' — bbPress';
-$title
+wp_specialchars( $title )
-}
-
@@ -391 +391 @@
-
-        function results_are_paged() {
-
+isset($this->paging_text) && 
-                        return true;
-                return false;
@@ -1015 +1015 @@
-
-        $plugin_name = wp_specialchars( trim($plugin_name[1]) );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $plugin_file = str_replace( '\\', '/', $plugin_file );
@@ -1111 +1127 @@
-        $theme = $name;
-
-
-
+
+
+
+
+
+
-        } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        } else {
-<a href="' . clean_url( trim($porter_uri[1]) ) . '" title="' . attribute_escape( __('Visit porter homepage') ) . '">' . wp_specialchars( trim($porter_name[1]) ) . '</a>
+
-        }
-
@@ -1136 +1160 @@
-}
-
+if ( !function_exists( 'checked' ) ) :
+function checked( $checked, $current) {
+        if ( $checked == $current)
+                echo ' checked="checked"';
+}
+endif;
+
+if ( !function_exists( 'selected' ) ) :
+function selected( $selected, $current) {
+        if ( $selected == $current)
+                echo ' selected="selected"';
+}
+endif;
+
-?>

trunk/bb-admin/content-posts.php

@@ -31 +31 @@
-        $h2_noun = __('Posts');
-else
-, $topic_open[$h2_open]
+
-
-printf( __( '%1$s%2$s%3$s%4$s%5$s' ), $h2_noun, $h2_search, $h2_forum, $h2_tag, $h2_author );

trunk/bb-admin/options-general.php

@@ -2 +2 @@
-require_once('admin.php');
-
-
+ 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && 
-        
-        bb_check_admin_referer( 'options-general-update' );
@@ -32 +32 @@
-}
-
-$_GET['updated']
+ !empty($_GET['updated']) 
-        bb_admin_notice( __('Settings saved.') );
-}
@@ -85 +85 @@
-                        <div>
-                                <select name="mod_rewrite" id="mod_rewrite">
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                </select>
-                                <p><?php printf(__('If you activate "Numeric" or "Name based" permalinks, you will need to create a file at <code>%s</code> containing the url rewriting rules <a href="%s">provided here</a>.'), BB_PATH . '.htaccess', bb_get_uri('bb-admin/rewrite-rules.php', null, BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_ADMIN)); ?></p>
@@ -170 +163 @@
-                        </label>
-                        <div>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                <div>
-                        <label for="avatars_default">
@@ -186 +176 @@
-                        <div>
-                                <select name="avatars_default" id="avatars_default">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                </select>
-                                <p>Select what style of avatar to display to users without a Gravatar</p>
@@ -217 +200 @@
-                        </div>
-                </div>
+<?php
+        remove_filter( 'bb_get_option_avatars_show', $bb_get_option_avatars_show );
+?>
-                <div>
-                        <label for="avatars_rating">
@@ -223 +209 @@
-                        <div>
-                                <select name="avatars_rating" id="avatars_rating">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                </select>
-                                <p class="gravatarRating">

trunk/bb-admin/options-wordpress.php

@@ -2 +2 @@
-require_once('admin.php');
-
-
+
+
+
+
-
-if ( in_array( $action, array('update-users', 'update-options') ) ) {
@@ -36 +39 @@
-}
-
-
+@
-        case 'update-users':
-                bb_admin_notice( __('User role mapping saved.') );
@@ -167 +170 @@
-                </div>
-                <script type="text/javascript" charset="utf-8">
+/* <![CDATA[ */
-                        function updateWordPressOptionURL () {
-                                var siteURLInputValue = document.getElementById('wp_siteurl').value;
@@ -193 +197 @@
-                        siteURLInput.onclick = updateWordPressOptionURL;
-                        siteURLInput.onchange = updateWordPressOptionURL;
+/* ]]> */
-                </script>
-<?php
@@ -247 +252 @@
-                        </label>
-<?php
-$advanced_display = 'none';
-if ( bb_get_option('user_bbdb_advanced') ) {
-        $advanced_display = 'block';
-        $checked = ' checked="checked"';
-
+
+
+
+
+
-?>
-                        <script type="text/javascript" charset="utf-8">

trunk/bb-admin/themes.php

@@ -56 +56 @@
-        $activation_url = clean_url( bb_nonce_url( $activation_url, 'switch-theme' ) );
-?>
-, $class
+
-                <div class="screen-shot"><?php if ( $screen_shot ) : ?><a href="<?php echo $activation_url; ?>" title="<?php echo attribute_escape( __('Click to activate') ); ?>"><img alt="<?php echo attribute_escape( $theme_data['Title'] ); ?>" src="<?php echo $screen_shot; ?>" /></a><?php endif; ?></div>
-                <div class="description">

trunk/bb-admin/users-blocked.php

@@ -3 +3 @@
-
-// Query the users
-
+@
-
-bb_get_admin_header();

trunk/bb-admin/users-moderators.php

@@ -3 +3 @@
-
-// Query the users
-
+@
-
-bb_get_admin_header();

trunk/bb-admin/users.php

@@ -3 +3 @@
-
-// Query the users
-$_GET['usersearch'], 
+@$_GET['usersearch'], @
-
-bb_get_admin_header();

trunk/bb-includes/class-bb-taxonomy.php

@@ -159 +159 @@
-                } else {
-                        $t = $this->get_taxonomy($taxonomies[0]);
-
+set($t->args) && is
-                                $args = array_merge($args, $t->args);
-                }

trunk/bb-includes/classes.php

@@ -279 +279 @@
-                // Only one FULLTEXT search per query please
-                if ( $array['search'] )
-unset($array['post_text'])
+$array['post_text'] = false
-
-                return $array;
@@ -1108 +1108 @@
-
-                // Walk the tree.
-this->previous_element) && ($element->$parent_field == $this->previous_element->$id_field)
+element) && !empty($this->previous_element) && $element->$parent_field == $this->previous_element->$id_field
-                        // Previous element is my parent. Descend a level.
-                        array_unshift($this->parents, $this->previous_element);
@@ -1119 +1119 @@
-                        }
-                        $this->depth++; //always do this so when we start the element further down, we know where we are
-
+!empty($element) && !empty($this->previous_element) && 
-                        // On the same level as previous element.
-                        if ( !$to_depth || ($this->depth <= $to_depth) ) {
@@ -1140 +1140 @@
-                                        call_user_func_array(array(&$this, 'end_el'), $cb_args);
-                                }
-
+!empty($element) && 
-                                        break;
-                                }
@@ -1154 +1154 @@
-                // Start the element.
-                if ( !$to_depth || ($this->depth <= $to_depth) ) {
-
+!empty($element) && 
-                                $cb_args = array_merge( array(&$output, $element, $this->depth - 1), $args);
-                                call_user_func_array(array(&$this, 'start_el'), $cb_args);
@@ -1200 +1200 @@
-
-        function &start( $elements, $walker = 'BB_Walker_Blank' ) {
+                $null = null;
-                $a = new BB_Loop( $elements );
-                if ( !$a->elements )
-
+$
-                $a->walker = new $walker;
-                return $a;
@@ -1245 +1246 @@
-
-                foreach ( $array as $key )
-
+
+
-        }
-
@@ -1270 +1272 @@
-                        end($this->elements);
-
-
+!empty($next) && 
-                        $classes[] = 'bb-parent';
-
+!empty($next) && 
-                        $classes[] = 'bb-precedes-sibling';
-                else
-                        $classes[] = 'bb-last-child';
-
-
+!empty($prev) && 
-                        $classes[] = 'bb-first-child';
-
+!empty($prev) && 
-                        $classes[] = 'bb-follows-sibling';
-                elseif ( $prev )

trunk/bb-includes/default-filters.php

@@ -25 +25 @@
-
-// Format Strings for Display
-
+, 'bb_title', 'bb_option_name'
-foreach ( $filters as $filter ) {
-        add_filter( $filter, 'wp_specialchars' );

trunk/bb-includes/functions.php

@@ -309 +309 @@
-        if ( $cache ) {
-                wp_cache_set( $topic->topic_id, $topic, 'bb_topic' );
-
+->topic
-        }
-
@@ -1600 +1600 @@
-function get_user_favorites( $user_id, $topics = false ) {
-        $user = bb_get_user( $user_id );
-$user->favorites
+!empty($user->favorites)
-                if ( $topics )
-                        $query = new BB_Query( 'topic', array('favorites' => $user_id, 'append_meta' => 0), 'get_user_favorites' );
@@ -1621 +1621 @@
-                return;
-
-
+
+
+
-}
-
@@ -1664 +1666 @@
-
-function bb_option( $option ) {
-bb_get_option( $option ) 
+apply_filters( 'bb_option_' . $option, bb_get_option( $option ) )
-}
-
@@ -1882 +1884 @@
-                $resource = $_resource;
-                $_query = wp_parse_args($_query);
-
-
-
-
+
+
-                $_query = array();
-        }
@@ -2038 +2038 @@
- */
-function bb_is_ssl() {
-
+@
-}
-
@@ -2389 +2389 @@
-// GMT -> Local
-// in future versions this could eaily become a user option.
-''
-
+null
+isset($args['format']) && 
-                return $time;
-        if ( !is_numeric($time) ) {
@@ -3095 +3095 @@
-                        $sql_terms[] = "$field LIKE ('%$likeit%')";
-
-
+isset($user_meta_ids) && 
-                $sql_terms[] = "ID IN (". join(',', $user_meta_ids) . ")";
-

trunk/bb-includes/template-functions.php

@@ -135 +135 @@
-        global $page, $topic, $forum;
-        
-$forum->forum_is_category
+ isset($forum->forum_is_category) && $forum->forum_is_category 
-                return;
-        
@@ -148 +148 @@
-        }
-
-$topic->topic_posts
+( isset($topic->topic_posts) ? $topic->topic_posts : 0 )
-
-        if ( !empty($h2) ) {
@@ -158 +158 @@
-        do_action('pre_post_form');
-
-$forum->forum_id
+isset($forum->forum_id) ? $forum->forum_id : 0
-                echo '<form class="postform post-form" id="postform" method="post" action="' . bb_get_uri('bb-post.php', null, BB_URI_CONTEXT_FORM_ACTION) . '">' . "\n";
-                echo '<fieldset>' . "\n";
@@ -578 +578 @@
-function bb_get_forum_is_category( $forum_id = 0 ) {
-        $forum = get_forum( get_forum_id( $forum_id ) );
-$forum->forum_is_category
+isset($forum->forum_is_category) ? $forum->forum_is_category : false
-}
-
@@ -602 +602 @@
-        global $page;
-        $forum = get_forum( get_forum_id( $forum_id ) );
-forum_
+
-}
-
@@ -676 +676 @@
-        }
-        $current_trail_forum_id = $trail_forum->forum_id;
-$trail_forum->forum_id > 0
+ $trail_forum && $trail_forum->forum_id > 0 
-                $crumb = $separator;
-                if ($current_trail_forum_id != $trail_forum->forum_id || !is_forum()) {
@@ -735 +735 @@
-                return $bb_forums_loop->elements;
-        }
-
+
+
-}
-
@@ -790 +791 @@
-        else
-                $_topic =& $topic;
-
+
+
+
+
-}
-
@@ -875 +879 @@
-function get_topic_deleted_posts( $id = 0 ) {
-        $topic = get_topic( get_topic_id( $id ) );
-$topic->deleted_posts
+isset($topic->deleted_posts) ? $topic->deleted_posts : 0
-}
-
@@ -958 +962 @@
-function topic_pages_add( $id = 0 ) {
-        $topic = get_topic( get_topic_id( $id ) );
-
-
-
+
+
+
+
+
-}
-
@@ -1074 +1080 @@
-        $uri = attribute_escape( bb_nonce_url( $uri, 'close-topic_' . $topic->topic_id ) );
-        
- onclick="return confirm(\'' . js_escape( $confirm ) . '\');"
+
-}
-
@@ -1662 +1668 @@
-        if ( is_array( $profile_info_keys ) ) {
-                foreach ( $profile_info_keys as $key => $label ) {
-
+|| !isset($user->$key) 
-                                continue;
-                        $val = 'user_url' == $key ? get_user_link( $user->ID ) : $user->$key;
-                        if (
-                                ( 'user_email' != $key || ( 'user_email' == $key && bb_current_user_can( 'edit_users' ) ) )
-                                && isset( $user->$key )
-                                && $val
-                                && 'http://' != $val
@@ -1727 +1732 @@
-                                $message = "<p class='error'>$message</p>";
-                        } else {
-$user->$key
+isset( $user->$key ) ? $user->$key : ''
-                                $message = '';
-                        }
@@ -1746 +1751 @@
-                                //$public_display['display_nickname'] = $user->nickname;
-                                $public_display['display_username'] = $user->user_login;
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                $public_display = array_unique(array_filter(array_map('trim', $public_display)));
-                                
@@ -1882 +1894 @@
-                                        $value = $label[3];
-                                } else {
-$user->$key
+isset($user->$key) ? $user->$key : ''
-                                }
-                                $message = '';
@@ -2116 +2128 @@
-        else
-                $_tag =& $tag;
-
+
+
+
-}
-
@@ -2418 +2432 @@
-        while ( $depth = bb_forum() ) :
-                global $forum; // Globals + References = Pain
-$disable_categories && $forum->forum_is_category
+ $disable_categories && isset($forum->forum_is_category) && $forum->forum_is_category 
-                        $options[] = array(
-                                'value' => 0,