Changeset 1588

Timestamp:

07/11/08 16:34:53 (5 months ago)

Author:

sambauers

Message:

Bring bbPress cookies up to speed with WordPress, first pass.

Files:

• trunk/bb-config-sample.php (modified) (1 diff)
• trunk/bb-edit.php (modified) (1 diff)
• trunk/bb-includes/functions.php (modified) (1 diff)
• trunk/bb-includes/pluggable.php (modified) (5 diffs)
• trunk/bb-post.php (modified) (1 diff)
• trunk/bb-settings.php (modified) (4 diffs)
• trunk/edit.php (modified) (1 diff)
• trunk/favorites.php (modified) (1 diff)
• trunk/profile-edit.php (modified) (1 diff)
• trunk/tag-add.php (modified) (1 diff)
• trunk/tag-remove.php (modified) (1 diff)

trunk/bb-config-sample.php

@@ -11 +11 @@
-                                     // If you are installing for the first time, leave them here
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-// If you are running multiple bbPress installations in a single database,

trunk/bb-edit.php

@@ -2 +2 @@
-require('./bb-load.php');
-
-
+'logged_in'
-
-$post_id = (int) $_POST['post_id'];

trunk/bb-includes/functions.php

@@ -1787 +1787 @@
-                'wp_siteurl' => '',
-                'wp_home' => '',
-''
+false
-                'usercookie' => '',
-                'passcookie' => '',
-                'authcookie' => '',
-                'cookiepath' => '',
-
+
+
+
+
+
+
+
+
-        );
-        

trunk/bb-includes/pluggable.php

@@ -2 +2 @@
-
-if ( !function_exists('bb_auth') ) :
-
-
+$scheme = 'auth'
+'', $scheme
-                nocache_headers();
-                header('Location: ' . bb_get_uri(null, null, BB_URI_CONTEXT_HEADER));
@@ -98 +98 @@
-
-if ( !function_exists('wp_validate_auth_cookie') ) :
-
+, $scheme = 'auth'
-        global $wp_auth_object;
-
+
+
+
+
+
+
+
+
-}
-endif;
-
-if ( !function_exists('wp_set_auth_cookie') ) :
-
+, $secure = ''
-        global $wp_auth_object;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-endif;
@@ -120 +138 @@
-function wp_clear_auth_cookie() {
-        global $bb, $wp_auth_object;
-
+
-        $wp_auth_object->clear_auth_cookie();
-        
-        // Old cookies
+        setcookie($bb->authcookie, ' ', time() - 31536000, $bb->cookiepath, $bb->cookiedomain);
+        setcookie($bb->authcookie, ' ', time() - 31536000, $bb->sitecookiepath, $bb->cookiedomain);
+        
+        // Even older cookies
-        setcookie($bb->usercookie, ' ', time() - 31536000, $bb->cookiepath, $bb->cookiedomain);
-        setcookie($bb->usercookie, ' ', time() - 31536000, $bb->sitecookiepath, $bb->cookiedomain);
@@ -236 +258 @@
-endif;
-
-bb has no options table and 
+
-if ( !function_exists('wp_salt') ) :
-
-
+
+
+
-        $secret_key = '';
-'put your unique phrase here'
+$bb_default_secret_key
-                $secret_key = BB_SECRET_KEY;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-endif;
-
-if ( !function_exists('wp_hash') ) :
-
-
+, $scheme = 'auth'
+$scheme
-
-        return hash_hmac('md5', $data, $salt);
@@ -285 +345 @@
- * @return string the password
- **/
-7
-
+12, $special_chars = true
+, $special_chars
-}
-endif;

trunk/bb-post.php

@@ -2 +2 @@
-require('./bb-load.php');
-
-
+'logged_in'
-
-if ( $throttle_time = bb_get_option( 'throttle_time' ) )

trunk/bb-settings.php

@@ -406 +406 @@
-        
-        if ( preg_match( '@^(https?://[^/]+)((?:/.*)*/{1,1})$@i', $bb->uri, $matches ) ) {
-Not used in core anymore, only set here for plugin compatibility
+Used when setting up cookie domain
-                $bb->domain = $matches[1];
-                // Used when setting up cookie paths
@@ -609 +609 @@
-}
-
+$bb->secure_auth_cookie = bb_get_option('secure_auth_cookie');
+if ( !$bb->secure_auth_cookie ) {
+        $bb->secure_auth_cookie = ($bb->wp_cookies_integrated ? 'wordpress_sec_' : 'bbpress_sec_') . BB_HASH;
+}
+
+$bb->logged_in_cookie = bb_get_option('logged_in_cookie');
+if ( !$bb->logged_in_cookie ) {
+        $bb->logged_in_cookie = ($bb->wp_cookies_integrated ? 'wordpress_logged_in_' : 'bbpress_logged_in_') . BB_HASH;
+}
+
-$bb->cookiepath = bb_get_option('cookiepath');
-if ( !$bb->cookiepath ) {
@@ -614 +624 @@
-}
-
+$bb->admin_cookie_path = bb_get_option('bb_admin_cookie_path');
+if ( !$bb->admin_cookie_path ) {
+        $bb->admin_cookie_path = $bb->path . 'bb-admin/';
+}
+
+$bb->core_plugins_cookie_path = bb_get_option('bb_core_plugins_cookie_path');
+if ( !$bb->core_plugins_cookie_path ) {
+        $bb->core_plugins_cookie_path = preg_replace('|https?://[^/]+|i', '', BB_CORE_PLUGIN_URL);
+}
+
+$bb->user_plugins_cookie_path = bb_get_option('bb_user_plugins_cookie_path');
+if ( !$bb->user_plugins_cookie_path ) {
+        $bb->user_plugins_cookie_path = preg_replace('|https?://[^/]+|i', '', BB_PLUGIN_URL);
+}
+
-$bb->sitecookiepath = bb_get_option('sitecookiepath');
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -651 +699 @@
-        require( BACKPRESS_PATH . 'class.wp-auth.php' );
-        
+        $cookies = array();
+        
+        $cookies['logged_in'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->cookiepath,
+                'name' => $bb->logged_in_cookie
+        );
+        
+        if ($bb->sitecookiepath && $bb->cookiepath != $bb->sitecookiepath) {
+                $cookies['logged_in'][] = array(
+                        'domain' => $bb->cookiedomain,
+                        'path' => $bb->sitecookiepath,
+                        'name' => $bb->logged_in_cookie
+                );
+        }
+        
+        $cookies['auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->admin_cookie_path,
+                'name' => $bb->authcookie
+        );
+        
+        $cookies['secure_auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->admin_cookie_path,
+                'name' => $bb->secure_auth_cookie
+        );
+        
+        $cookies['auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->core_plugins_cookie_path,
+                'name' => $bb->authcookie
+        );
+        
+        $cookies['secure_auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->core_plugins_cookie_path,
+                'name' => $bb->secure_auth_cookie
+        );
+        
+        $cookies['auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->user_plugins_cookie_path,
+                'name' => $bb->authcookie
+        );
+        
+        $cookies['secure_auth'][] = array(
+                'domain' => $bb->cookiedomain,
+                'path' => $bb->user_plugins_cookie_path,
+                'name' => $bb->secure_auth_cookie
+        );
+        
+        if ($bb->wp_admin_cookie_path) {
+                $cookies['auth'][] = array(
+                        'domain' => $bb->cookiedomain,
+                        'path' => $bb->wp_admin_cookie_path,
+                        'name' => $bb->authcookie
+                );
+        
+                $cookies['secure_auth'][] = array(
+                        'domain' => $bb->cookiedomain,
+                        'path' => $bb->wp_admin_cookie_path,
+                        'name' => $bb->secure_auth_cookie
+                );
+        }
+        
+        if ($bb->wp_plugins_cookie_path) {
+                $cookies['auth'][] = array(
+                        'domain' => $bb->cookiedomain,
+                        'path' => $bb->wp_plugins_cookie_path,
+                        'name' => $bb->authcookie
+                );
+        
+                $cookies['secure_auth'][] = array(
+                        'domain' => $bb->cookiedomain,
+                        'path' => $bb->wp_plugins_cookie_path,
+                        'name' => $bb->secure_auth_cookie
+                );
+        }
+        
-        /**
-         * WP_Auth object
-         */
-
-
-
-
-
+
+
+
+
+
+
+
-}
-

trunk/edit.php

@@ -2 +2 @@
-require('./bb-load.php');
-
-
+'logged_in'
-
-$post_id = (int) $_GET['id'];

trunk/favorites.php

@@ -2 +2 @@
-require_once('./bb-load.php');
-
-
+'logged_in'
-
-if ( !bb_current_user_can( 'edit_favorites_of', $user_id ) )

trunk/profile-edit.php

@@ -4 +4 @@
-bb_ssl_redirect();
-
-
+'logged_in'
-
-if ( !bb_current_user_can( 'edit_user', $user_id ) ) {

trunk/tag-add.php

@@ -2 +2 @@
-require('./bb-load.php');
-
-
+'logged_in'
-
-if ( !bb_is_user_logged_in() )

trunk/tag-remove.php

@@ -2 +2 @@
-require('./bb-load.php');
-
-
+'logged_in'
-
-$tag_id = (int) @$_GET['tag'];