Changeset 1753

Timestamp:

09/01/2009 06:40:47 PM (16 years ago)

Author:

apeatling

Message:

Fixes #937, #938

File:

• trunk/bp-forums/bp-forums-admin.php (modified) (4 diffs)

trunk/bp-forums/bp-forums-admin.php

@@ -16 +16 @@
         <?php
         
-        if ( isset( $_REQUEST['reinstall']) || !bp_forums_is_installed_correctly() )
+        if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() )
             bp_forums_bbpress_install_wizard();
         else { ?>
@@ -31 +31 @@
 
     switch( $_REQUEST['step'] ) {       
-        case 'existing': 
+        case 'existing':
             if ( 1 == (int)$_REQUEST['doinstall'] ) {
-                if ( !bp_forums_configure_existing_install() )
+                if ( !bp_forums_configure_existing_install() ) {
                     _e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' );
-            }
+                } else {
+                    ?>
+                    <h3><?php _e( 'Forums were set up correctly using your existing bbPress install!') ?></h3>
+                    <p><?php _e( 'BuddyPress will now use its internal copy of bbPress to run the forums on your site. If you wish, you can remove your old bbPress installation files, as long as you keep the bb-config.php file in the same location.' ) ?></p><?php
+                }
+            } else {
                 ?>
                     <form action="" method="post">
@@ -47 +52 @@
                     </form>
                 <?php   
+            }
         break;
-
+        
         case 'new':
             if ( 1 == (int)$_REQUEST['doinstall'] ) {
@@ -89 +95 @@
     check_admin_referer( 'bp_forums_existing_install_init' );
     
+    /* Sanitize $_REQUEST['bbconfigloc'] */
+    $_REQUEST['bbconfigloc'] = apply_filters( 'bp_forums_bbconfig_location', $_REQUEST['bbconfigloc'] );
+    
     if ( false === strpos( $_REQUEST['bbconfigloc'], 'bb-config.php' ) ) {
         if ( '/' != substr( $_REQUEST['bbconfigloc'], -1, 1 ) )