Index: trunk/admin/users/user_list.php =================================================================== diff -u -N -r228 -r267 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 228) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 267) @@ -238,7 +238,7 @@ /* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/ $sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, "; -$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u "; +$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y %H:%i:%s') as DateCreated FROM ".GetTablePrefix()."PortalUser as u "; $sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) "; $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE $where"; Index: trunk/admin/tools/sql_result.php =================================================================== diff -u -N -r13 -r267 --- trunk/admin/tools/sql_result.php (.../sql_result.php) (revision 13) +++ trunk/admin/tools/sql_result.php (.../sql_result.php) (revision 267) @@ -122,7 +122,7 @@ > - + " onclick="history.go(-1);"> @@ -134,7 +134,7 @@ > - + Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r232 -r267 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 232) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 267) @@ -34,7 +34,7 @@ $this->PermCacheGroups =""; $this->UseTempKeys = $TempKeys; - if( GetVar('help_usage') == 'install' ) return; + if( GetVar('help_usage') == 'install' ) return; if(!$this->UseTempKeys || strlen($id)==0) { Index: trunk/kernel/include/portaluser.php =================================================================== diff -u -N -r228 -r267 --- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 228) +++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 267) @@ -628,6 +628,9 @@ case "user_date": return LangDate($this->Get("CreatedOn")); break; + case "user_datetime": + return LangDate($this->Get("CreatedOn"))." ".LangTime($this->Get("CreatedOn")); + break; case "user_dob": return LangDate($this->Get("dob")); break; Index: trunk/admin/users/adduser.php =================================================================== diff -u -N -r104 -r267 --- trunk/admin/users/adduser.php (.../adduser.php) (revision 104) +++ trunk/admin/users/adduser.php (.../adduser.php) (revision 267) @@ -299,7 +299,7 @@ > - "> + "> Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r259 -r267 --- trunk/kernel/include/modules.php (.../modules.php) (revision 259) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 267) @@ -890,6 +890,11 @@ } } } + +if (strstr($_SERVER['SCRIPT_NAME'], 'install')) { + $objSession->Delete(); +} + if( !isset($SearchPerformed) ) $SearchPerformed = false; if($SearchPerformed == true) $objSearch->BuildIndexes(); LogEntry("Finished Loading Module action scripts\n"); Index: trunk/kernel/action.php =================================================================== diff -u -N -r265 -r267 --- trunk/kernel/action.php (.../action.php) (revision 265) +++ trunk/kernel/action.php (.../action.php) (revision 267) @@ -1897,7 +1897,7 @@ $ado = GetADODBConnection(); if(strlen($sql)) { - $SqlResult = $ado->Execute($SqlQuery); + $SqlResult = $ado->Execute(stripslashes($SqlQuery)); $SqlError = $ado->ErrorMsg(); $SqlErrorNum = $ado->ErrorNo(); }