Changeset 1174

Timestamp:

03/02/2008 06:34:21 AM (18 years ago)

Author:

sambauers

Message:

Make Bozo and Akismet plugins. Add bb-plugins directory. Let's see how it feels for a day or two then keep or dump.

Location:

trunk

Files:

• bb-admin/admin-functions.php (modified) (1 diff)
• bb-admin/options-general.php (modified) (1 diff)
• bb-admin/plugins.php (modified) (2 diffs)
• bb-admin/upgrade-functions.php (modified) (2 diffs)
• bb-includes/akismet.php (deleted)
• bb-includes/bozo.php (deleted)
• bb-includes/functions.php (modified) (1 diff)
• bb-plugins (added)
• bb-plugins/akismet.php (added)
• bb-plugins/bozo.php (added)
• bb-settings.php (modified) (4 diffs)

trunk/bb-admin/admin-functions.php

@@ -760 +760 @@
 /* Pluigns */
 
+function bb_get_plugins_callback( $f, $_f ) {
+    if ( ".php" != substr($f,-4) || "_" == substr($_f, 0, 1) )
+        return false;
+    return bb_get_plugin_data( $f );
+}
+
 function bb_get_plugins() {
-    $dir = new BB_Dir_Map( BBPLUGINDIR, array(
-        'callback' => create_function('$f,$_f', 'if ( ".php" != substr($f,-4) || "_" == substr($_f, 0, 1) ) return false; return bb_get_plugin_data( $f );'),
+    $dir = new BB_Dir_Map( BBDEFAULTPLUGINDIR, array(
+        'callback' => 'bb_get_plugins_callback',
         'recurse' => 1
     ) );
-    $r = $dir->get_results();
-    return is_wp_error($r) ? array() : $r;
+    $r1 = $dir->get_results();
+    $r1 = is_wp_error($r1) ? array() : $r1;
+    $dir = new BB_Dir_Map( BBPLUGINDIR, array(
+        'callback' => 'bb_get_plugins_callback',
+        'recurse' => 1
+    ) );
+    $r2 = $dir->get_results();
+    $r2 = is_wp_error($r2) ? array() : $r2;
+    return array_merge($r1, $r2);
 }
 

trunk/bb-admin/options-general.php

@@ -122 +122 @@
     </fieldset>
     <fieldset>
-        <legend><?php _e('Anti-spam') ?></legend>
-        <label for="akismet_key">
-            <?php _e('Akismet Key:') ?>
-        </label>
-        <div>
-            <input class="text" name="akismet_key" id="akismet_key" value="<?php bb_form_option('akismet_key'); ?>" />
-            <p><?php _e('You do not need a key to run bbPress, but if you want to take advantage of Akismet\'s powerful spam blocking, you\'ll need one.'); ?></p>
-            <p><?php _e('You can get an Akismet key at <a href="http://wordpress.com/api-keys/">WordPress.com</a>') ?></p>
-        </div>
-    </fieldset>
-    <fieldset>
         <?php bb_nonce_field( 'options-general-update' ); ?>
         <input type="hidden" name="action" id="action" value="update" />

trunk/bb-admin/plugins.php

@@ -4 +4 @@
 $plugins = bb_get_plugins();
 $_plugins = array();
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') ) {
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) ) {
+    $_plugins_glob = glob(BBDEFAULTPLUGINDIR . '_*.php');
     foreach ( $_plugins_glob as $_plugin ) {
         $_data = bb_get_plugin_data( $_plugin );
         $_plugins[$_plugin] = $_data ? $_data : true;
     }
+    unset($_plugins_glob, $_data, $_plugin);
+    
+    $_plugins_glob = glob(BBPLUGINDIR . '_*.php');
+    foreach ( $_plugins_glob as $_plugin ) {
+        $_data = bb_get_plugin_data( $_plugin );
+        $_plugins[$_plugin] = $_data ? $_data : true;
+    }
+    unset($_plugins_glob, $_data, $_plugin);
 }
-unset($_plugins_glob, $_plugin);
+
 
 $current = (array) bb_get_option( 'active_plugins' );
@@ -16 +25 @@
 $update = false;
 foreach ( $current as $c => $cur )
-    if ( !file_exists(BBPLUGINDIR . $cur) ) {
+    if ( !file_exists(BBPLUGINDIR . $cur) && !file_exists(BBDEFAULTPLUGINDIR . $cur) ) {
         $update = true;
         unset($current[$c]);

trunk/bb-admin/upgrade-functions.php

@@ -25 +25 @@
     $bb_upgrade[] = bb_upgrade_1020(); // Add a user_nicename to existing users
     $bb_upgrade[] = bb_upgrade_1030(); // Move admin_email option to from_email
+    $bb_upgrade[] = bb_upgrade_1040(); // Activate Akismet and bozo plugins on upgrade only
     bb_update_db_version();
     return $bb_upgrade; 
@@ -520 +521 @@
 }
 
+// Activate Akismet and bozo plugins on upgrade only
+function bb_upgrade_1040() {
+    if ( ( $dbv = bb_get_option_from_db( 'bb_db_version' ) ) && $dbv >= 1174 )
+        return;
+    
+    // Only do this when upgrading
+    if ( defined( 'BB_UPGRADING' ) && BB_UPGRADING ) {
+        $plugins = bb_get_option('active_plugins')
+        if ( bb_get_option('akismet_key') && !in_array('akismet.php', $plugins) ) {
+            $plugins[] = 'akismet.php';
+        }
+        if ( !in_array('bozo.php', $plugins) ) {
+            $plugins[] = 'bozo.php';
+        }
+        ksort($plugins);
+        bb_update_option( 'active_plugins', $plugins );
+    }
+    
+    bb_update_option( 'bb_db_version', 1174 );
+}
+
 function bb_deslash($content) {
     // Note: \\\ inside a regex denotes a single backslash.

trunk/bb-includes/functions.php

@@ -1441 +1441 @@
         break;
     case 'bb_db_version' :
-        return '1058'; // Don't filter
+        return '1174'; // Don't filter
         break;
     case 'html_type' :

trunk/bb-settings.php

@@ -133 +133 @@
 require( BBPATH . BBINC . 'deprecated.php');
 
-if ( defined('BB_DISABLE_BOZO_CHECKS') && !BB_DISABLE_BOZO_CHECKS )
-    require( BBPATH . BBINC . 'bozo.php');
-
 require( BBPATH . BBINC . 'default-filters.php');
 require( BBPATH . BBINC . 'script-loader.php');
@@ -146 +143 @@
     $bbdb->show_errors();
 }
-
-if ( bb_get_option( 'akismet_key' ) )
-    require( BBPATH . BBINC . 'akismet.php');
 
 $_GET    = bb_global_sanitize($_GET   );
@@ -188 +182 @@
 if ( !defined('BBPLUGINURL') )
     define('BBPLUGINURL', $bb->uri . 'my-plugins/');
+if ( !defined('BBDEFAULTPLUGINDIR') )
+    define('BBDEFAULTPLUGINDIR', BBPATH . 'bb-plugins/');
+if ( !defined('BBDEFAULTPLUGINURL') )
+    define('BBDEFAULTPLUGINURL', $bb->uri . 'bb-plugins/');
 if ( !defined('BBTHEMEDIR') )
     define('BBTHEMEDIR', BBPATH . 'my-templates/');
@@ -377 +375 @@
 
 // Load Plugins
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') )
+
+// Underscore plugins
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) ) {
+    // First BBDEFAULTPLUGINDIR
+    $_plugins_glob = glob(BBDEFAULTPLUGINDIR . '_*.php');
     foreach ( $_plugins_glob as $_plugin )
         require($_plugin);
-unset($_plugins_glob, $_plugin);
+    unset($_plugins_glob, $_plugin);
+    
+    // Second BBPLUGINDIR, with no name clash testing
+    $_plugins_glob = glob(BBPLUGINDIR . '_*.php');
+    foreach ( $_plugins_glob as $_plugin )
+        require($_plugin);
+    unset($_plugins_glob, $_plugin);
+}
 do_action( 'bb_underscore_plugins_loaded' );
 
+// Plugins in BBPLUGINDIR take precedence over BBDEFAULTPLUGINDIR when names collide
 if ( $plugins = bb_get_option( 'active_plugins' ) )
     foreach ( (array) $plugins as $plugin )
-        if ( file_exists(BBPLUGINDIR . $plugin) )
+        if ( file_exists(BBPLUGINDIR . $plugin) ) {
             require( BBPLUGINDIR . $plugin );
+        } elseif ( file_exists(BBDEFAULTPLUGINDIR . $plugin) ) {
+            require( BBDEFAULTPLUGINDIR . $plugin );
+        }
 do_action( 'bb_plugins_loaded' );
 unset($plugins, $plugin);