Changeset 10654 for trunk/src/bp-groups/bp-groups-actions.php

Timestamp:

03/16/2016 07:39:50 PM (10 years ago)

Author:

djpaul

Message:

Support secure cookies.

If the site is served over HTTPS, mark our cookies as secure.

Fixes #6961

Props DJPaul, w3dzign

File:

• trunk/src/bp-groups/bp-groups-actions.php (modified) (3 diffs)

trunk/src/bp-groups/bp-groups-actions.php

@@ -123 +123 @@
         unset( $bp->groups->completed_create_steps );
 
-        setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH );
-        setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
+        setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+        setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
 
         $reset_steps = true;
@@ -253 +253 @@
 
         // Reset cookie info.
-        setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
-        setcookie( 'bp_completed_create_steps', base64_encode( json_encode( $bp->groups->completed_create_steps ) ), time()+60*60*24, COOKIEPATH );
+        setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+        setcookie( 'bp_completed_create_steps', base64_encode( json_encode( $bp->groups->completed_create_steps ) ), time()+60*60*24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
 
         // If we have completed all steps and hit done on the final step we
@@ -263 +263 @@
             unset( $bp->groups->completed_create_steps );
 
-            setcookie( 'bp_new_group_id', false, time() - 3600, COOKIEPATH );
-            setcookie( 'bp_completed_create_steps', false, time() - 3600, COOKIEPATH );
+            setcookie( 'bp_new_group_id', false, time() - 3600, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+            setcookie( 'bp_completed_create_steps', false, time() - 3600, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
 
             // Once we completed all steps, record the group creation in the activity stream.