Author: acoburn
Date: Thu May 31 17:04:15 2012
New Revision: 1344815
URL: http://svn.apache.org/viewvc?rev=1344815&view=rev
Log:
Fixed shibboleth-related errors encountered while testing 2.3 RC1, including:
* user.validated field was not added to the database creation and modification
scripts
* in utils.php: the initGlobals() function was modifying a local rather than
global version of $addUserFuncArgs
* updated updateShibUser so that the user.validated field is set to 1 whenever
a user logs into the website
Modified:
incubator/vcl/trunk/mysql/update-vcl.sql
incubator/vcl/trunk/mysql/vcl.sql
incubator/vcl/trunk/web/.ht-inc/authmethods/shibauth.php
incubator/vcl/trunk/web/.ht-inc/utils.php
Modified: incubator/vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1344815&r1=1344814&r2=1344815&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-vcl.sql (original)
+++ incubator/vcl/trunk/mysql/update-vcl.sql Thu May 31 17:04:15 2012
@@ -827,6 +827,14 @@ CALL AddColumnIfNotExists('request', 'ch
-- --------------------------------------------------------
--
+-- Table structure change for table `user`
+--
+
+-- --------------------------------------------------------
+
+CALL AddColumnIfNotExists('user', 'validated', "tinyint(1) unsigned NOT NULL
default '1'");
+
+--
-- Table structure for table `usergrouppriv`
--
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=1344815&r1=1344814&r2=1344815&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Thu May 31 17:04:15 2012
@@ -1076,6 +1076,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`mapserial` tinyint(1) unsigned NOT NULL default '0',
`showallgroups` tinyint(1) unsigned NOT NULL default '0',
`lastupdated` datetime NOT NULL default '0000-00-00 00:00:00',
+ `validated` tinyint(1) unsigned NOT NULL default '1',
PRIMARY KEY (`id`),
UNIQUE KEY `unityid` (`unityid`,`affiliationid`),
UNIQUE KEY `uid` (`uid`),
Modified: incubator/vcl/trunk/web/.ht-inc/authmethods/shibauth.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authmethods/shibauth.php?rev=1344815&r1=1344814&r2=1344815&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authmethods/shibauth.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authmethods/shibauth.php Thu May 31
17:04:15 2012
@@ -100,7 +100,8 @@ function updateShibUser($userid) {
$email = mysql_real_escape_string($user['email']);
$query .= "email = '$email', ";
}
- $query .= "lastupdated = NOW() "
+ $query .= "lastupdated = NOW(), "
+ . "validated = 1 "
. "WHERE id = {$user['id']}";
doQuery($query, 101, 'vcl', 1);
return $user;
Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=1344815&r1=1344814&r2=1344815&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Thu May 31 17:04:15 2012
@@ -65,7 +65,7 @@ function initGlobals() {
global $semislocked, $days, $phpVer, $keys, $pemkey, $AUTHERROR;
global $passwdArray, $skin, $contdata, $lastmode, $inContinuation;
global $totalQueries, $ERRORS, $queryTimes, $actions;
- global $affilValFunc, $addUserFunc, $updateUserFunc;
+ global $affilValFunc, $addUserFunc, $updateUserFunc, $addUserFuncArgs;
define("SECINDAY", 86400);
define("SECINWEEK", 604800);
