Changeset 1386

Timestamp:

03/30/2008 10:36:13 AM (19 years ago)

Author:

sambauers

Message:

Various optimisations and typo fixes - Fixes #842 - props momo360modena - branches/0.8

Location:

branches/0.8

Files:

• bb-admin/admin-functions.php (modified) (2 diffs)
• bb-admin/class-install.php (modified) (3 diffs)
• bb-admin/content-forums.php (modified) (1 diff)
• bb-admin/export.php (modified) (3 diffs)
• bb-admin/upgrade-functions.php (modified) (1 diff)
• bb-includes/functions.php (modified) (1 diff)
• bb-includes/l10n.php (modified) (1 diff)
• bb-includes/locale.php (modified) (1 diff)
• bb-includes/registration-functions.php (modified) (2 diffs)
• bb-includes/template-functions.php (modified) (6 diffs)
• bb-plugins/akismet.php (modified) (2 diffs)
• bb-plugins/bozo.php (modified) (4 diffs)

branches/0.8/bb-admin/admin-functions.php

@@ -84 +84 @@
 function bb_admin_add_submenu($display_name, $capability, $file_name, $parent = 'plugins.php')
 {
-        global $bb_menu, $bb_submenu;
+        global $bb_submenu;
         if ($display_name && $capability && $file_name) {
                 $bb_submenu[$parent][] = array($display_name, $capability, $file_name);
@@ -557 +557 @@
 function bb_forum_form( $forum_id = 0 ) {
         $forum_id = (int) $forum_id;
-        if ( $forum_id && !$forum = get_forum( $forum_id ) )
+        if ( $forum_id && !get_forum( $forum_id ) )
                 return;
         $action = $forum_id ? 'update' : 'add';

branches/0.8/bb-admin/class-install.php

@@ -990 +990 @@
                 
                 // Loop through the sample config and write lines to the new config file
-                foreach ($sample_config as $line_num => $line) {
+                foreach ($sample_config as $line) {
                         switch (substr($line,0,18)) {
                                 case "define('BBDB_NAME'":
@@ -1322 +1322 @@
                         $this->strings[3]['form_errors']['keymaster_user_login'][] = 'userlogin';
                 }
-                $data['keymaster_user_login']['value'] == sanitize_user($data['keymaster_user_login']['value']);
+                $data['keymaster_user_login']['value'] = sanitize_user($data['keymaster_user_login']['value']);
                 
                 // bb_verify_email() needs this
@@ -1520 +1520 @@
                                         
                                         // Loop through the sample config and write lines to the new config file
-                                        foreach ($config as $line_num => $line) {
+                                        foreach ($config as $line) {
                                                 if (substr($line,0,18) == "define('BB_SECRET_") {
                                                         $config_lines[] = str_replace("'" . BB_SECRET_KEY . "'", "'" . $data2['wp_secret_key']['value'] . "'", $line);

branches/0.8/bb-admin/content-forums.php

@@ -37 +37 @@
 <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>
-        <p>This forum contains</p>
+        <p><?php _e('This forum contains'); ?></p>
         <ul>
                 <li><?php printf(__ngettext('%d topic', '%d topics', $deleted_forum->topics), $deleted_forum->topics); ?></li>

branches/0.8/bb-admin/export.php

@@ -222 +222 @@
 function bb_export_topic_tags( $r, $topic_id ) {
         global $topic_tag_cache;
-        if ( !$topic = get_topic( $topic_id ) )
+        if ( !get_topic( $topic_id ) )
                 return;
 
@@ -239 +239 @@
 function bb_export_topic_posts( $r, $topic_id ) {
         global $bb_post_cache;
-        if ( !$topic = get_topic( $topic_id ) )
+        if ( !get_topic( $topic_id ) )
                 return;
 
@@ -272 +272 @@
                         $bb_user_cache = array(); // For the sake of memory
                 }
-                unset($users, $user_ids, $user_id, $page);
+                unset($users, $user, $page);
         }
 

branches/0.8/bb-admin/upgrade-functions.php

@@ -429 +429 @@
 
         $bbdb->hide_errors();
-        if ( !$ids = $bbdb->get_var("SELECT forum_slug FROM $bbdb->forums ORDER BY forum_order ASC LIMIT 1" ) )
+        if ( !$bbdb->get_var("SELECT forum_slug FROM $bbdb->forums ORDER BY forum_order ASC LIMIT 1" ) )
                 return; // Wait till after dbDelta
         $bbdb->show_errors();

branches/0.8/bb-includes/functions.php

@@ -53 +53 @@
                         $branch[$leaf->forum_id] = true;
                 $_leaves = false;
-                return $tree = empty($branch) ? false : $branch;
+                return ( empty($branch) ? false : $branch );
         }
 

branches/0.8/bb-includes/l10n.php

@@ -67 +67 @@
 
 function load_default_textdomain() {
-        global $l10n;
-
         $locale = get_locale();
         $mofile = BB_LANG_DIR . "$locale.mo";

branches/0.8/bb-includes/locale.php

@@ -113 +113 @@
         function _load_locale_data() {
                 $locale = get_locale();
-                $locale_file = BB_PATH . "bb-includes/languages/$locale.php";
-                if ( !file_exists($locale_file) )
+                $locale_file = BB_LANG_DIR . $locale . '.php';
+                if ( !is_file($locale_file) )
                         return;
 

branches/0.8/bb-includes/registration-functions.php

@@ -5 +5 @@
                 '[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.'.
                 '[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$', $email)) {
-                if ( $check_domain && function_exists('checkdnsrr') ) {
+                if ( function_exists('checkdnsrr') ) {
                         list (, $domain)  = explode('@', $email);
                         if ( checkdnsrr($domain . '.', 'MX') || checkdnsrr($domain . '.', 'A') ) {
@@ -86 +86 @@
 
 function bb_send_pass( $user, $pass ) {
-        global $bbdb;
         if ( !$user = bb_get_user( $user ) )
                 return false;

branches/0.8/bb-includes/template-functions.php

@@ -129 +129 @@
 
 function post_form( $h2 = '' ) {
-        global $bb, $page, $topic, $forum;
+        global $page, $topic, $forum;
         $add = topic_pages_add();
         if ( empty($h2) && false !== $h2 ) {
@@ -170 +170 @@
 
 function edit_form() {
-        global $bb_post, $topic_title;
+        global $bb_post;
         echo "<form class='postform edit-form' method='post' action='" . bb_get_option('uri')  . "bb-edit.php'>\n";
         echo "<fieldset>\n";
@@ -685 +685 @@
                 return false;
 
-        if ( $r = $bb_forums_loop->step() ) {
+        if ( $bb_forums_loop->step() ) {
                 $GLOBALS['forum'] =& $bb_forums_loop->elements[key($bb_forums_loop->elements)]; // Globalize the current forum object
         } else {
@@ -796 +796 @@
 
 function topic_posts( $id = 0 ) {
-        echo apply_filters( 'topic_posts', get_topic_posts( $id = 0 ), get_topic_id( $id ) );
+        echo apply_filters( 'topic_posts', get_topic_posts( $id ), get_topic_id( $id ) );
 }
 
@@ -893 +893 @@
 
 function get_page_number_links($page, $total) {
-        $r = '';
         $args = array();
         $uri = $_SERVER['REQUEST_URI'];
@@ -1959 +1958 @@
         extract($args, EXTR_SKIP);
 
-        if ( !$forums = bb_forums( $args ) )
+        if ( !bb_forums( $args ) )
                 return;
 

branches/0.8/bb-plugins/akismet.php

@@ -80 +80 @@
 
 function bb_akismet_verify_key( $key ) {
-        global $bb_ksd_pre_post_status, $bb_ksd_api_host, $bb_ksd_api_port;
+        global $bb_ksd_api_port;
         $blog = urlencode( bb_get_option('uri') );
         $response = bb_ksd_http_post("key=$key&blog=$blog", 'rest.akismet.com', '/1.1/verify-key', $bb_ksd_api_port);
@@ -269 +269 @@
 
 function bb_ksd_admin_page() {
-        global $bb_current_submenu, $bb_posts, $page;
+        global $bb_posts, $page;
         if ( !bb_akismet_verify_key( bb_get_option( 'akismet_key' ) ) ) : ?>
 <div class="error"><p><?php printf(__('The API key you have specified is invalid.  Please double check the <strong>Akismet Key</strong> set in <a href="%s">Akismet configuration</a>.  If you don\'t have an API key yet, you can get one at <a href="%s">WordPress.com</a>.'), 'admin-base.php?plugin=bb_ksd_configuration_page', 'http://wordpress.com/api-keys/'); ?></p></div>

branches/0.8/bb-plugins/bozo.php

@@ -37 +37 @@
         if ( 1 < $page )
                 $limit = ($limit * ($page - 1)) . ", $limit";
-        $bozo_mkey = $bbdb->prefix . 'bozo_topics';
         $bb_last_countable_query = "SELECT user_id FROM $bbdb->usermeta WHERE meta_key='is_bozo' AND meta_value='1' ORDER BY umeta_id DESC LIMIT $limit";
         if ( $ids = (array) $bbdb->get_col( $bb_last_countable_query ) )
@@ -104 +103 @@
                                 endif;
                         endforeach;
-                        unset($topics, $t, $i, $counts, $posters, $bozos);
+                        unset($topics, $i, $counts, $posters, $bozos);
                 endif;
                 if ( $old ) :
@@ -234 +233 @@
                 else
                         $user->bozo_topics = array($topic_id => 1);
-                bb_update_usermeta( $uid, $bbdb->prefix . 'bozo_topics', $user->bozo_topics );
+                bb_update_usermeta( $user_id, $bbdb->prefix . 'bozo_topics', $user->bozo_topics );
         }
 }
@@ -255 +254 @@
                 if ( --$user->bozo_topics[$topic_id] < 1 )
                         unset($user->bozo_topics[$topic_id]);
-                bb_update_usermeta( $uid, $bbdb->prefix . 'bozo_topics', $user->bozo_topics );
+                bb_update_usermeta( $user_id, $bbdb->prefix . 'bozo_topics', $user->bozo_topics );
         }
 }
 
 function bb_bozo_profile_admin_keys( $a ) {
-        global $user;
         $a['is_bozo'] = array(
                 0,                                                      // Required