summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLester Caine <lester@lsces.co.uk>2026-06-06 23:05:27 +0100
committerLester Caine <lester@lsces.co.uk>2026-06-06 23:05:27 +0100
commitd7c0da0cbc86398d3a71a64355ca5e40fd26c2b6 (patch)
tree01517da0cb6e4bf2d38d09931e79c6ca9e85275c
parentce2c807ce05078401b3d105275d396297466e13d (diff)
downloadusers-d7c0da0cbc86398d3a71a64355ca5e40fd26c2b6.tar.gz
users-d7c0da0cbc86398d3a71a64355ca5e40fd26c2b6.tar.bz2
users-d7c0da0cbc86398d3a71a64355ca5e40fd26c2b6.zip
users: revert installer login changes to validate.php and getSiteCookieName
Revert validate.php installer redirect and getSiteCookieName cookie-reuse fallback. Both caused more problems than they solved. Original behaviour restored; upgrade-time access via gOverrideLoginFunction works fine. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
-rwxr-xr-xincludes/classes/RoleUser.php13
-rwxr-xr-xvalidate.php7
2 files changed, 1 insertions, 19 deletions
diff --git a/includes/classes/RoleUser.php b/includes/classes/RoleUser.php
index f6ab42b..655404e 100755
--- a/includes/classes/RoleUser.php
+++ b/includes/classes/RoleUser.php
@@ -1229,18 +1229,7 @@ class RoleUser extends \Bitweaver\Liberty\LibertyMime {
public static function getSiteCookieName() {
global $gBitSystem;
- $cookie_site = strtolower( preg_replace( "/[^a-zA-Z0-9]/", "", $gBitSystem->getConfig( 'site_title', '' )));
- if( empty( $cookie_site ) ) {
- // site_title not yet in kernel_config (e.g. during installer/upgrade).
- // Reuse any existing bit-user-* cookie so the session name stays consistent
- // across requests rather than splitting into bit-user-bitweaver vs the real name.
- foreach( array_keys( $_COOKIE ) as $name ) {
- if( strpos( $name, 'bit-user-' ) === 0 ) {
- return $name;
- }
- }
- $cookie_site = 'bitweaver';
- }
+ $cookie_site = strtolower( preg_replace( "/[^a-zA-Z0-9]/", "", $gBitSystem->getConfig( 'site_title', 'bitweaver' )));
return 'bit-user-'.$cookie_site;
}
diff --git a/validate.php b/validate.php
index 09ef16c..dd91b29 100755
--- a/validate.php
+++ b/validate.php
@@ -151,13 +151,6 @@ if( !empty( $tpl ) ) {
$redirectUrl = $gBitUser->getPostLoginUrl();
}
-// If the admin just logged in and the installer is still required, go there directly.
-// This bypasses the unreliable session-based loginfrom mechanism used during upgrades,
-// where the session cookie name can differ between pages if kernel_config isn't fully loaded.
-if( $gBitUser->isAdmin() && !empty( $gBitSystem->mConfig ) && version_compare( MIN_BIT_VERSION, $gBitSystem->getVersion(), '>' ) ) {
- KernelTools::bit_redirect( INSTALL_PKG_URL.'install.php' );
-}
-
if( !empty( $redirectUrl ) ) {
KernelTools::bit_redirect( $redirectUrl );
}