ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
May 2008
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
25 participants
586 discussions
Start a n
N
ew thread
[mpiulachs] 33649: - express PCH location in a more correct way
by mpiulachs@svn.reactos.org
Author: mpiulachs Date: Thu May 22 15:45:58 2008 New Revision: 33649 URL:
http://svn.reactos.org/svn/reactos?rev=33649&view=rev
Log: - express PCH location in a more correct way Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e…
============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Thu May 22 15:45:58 2008 @@ -26,6 +26,8 @@ <file>volinfo.c</file> <file>write.c</file> </directory> + <directory name="inc"> + <pch>ext2fsd.h</pch> + </directory> <file>ext2fs.rc</file> - <pch>inc/ext2fsd.h</pch> </module>
16 years, 4 months
1
0
0
0
[janderwald] 33648: - add GetTraceEnableFlags prototype
by janderwald@svn.reactos.org
Author: janderwald Date: Thu May 22 15:26:53 2008 New Revision: 33648 URL:
http://svn.reactos.org/svn/reactos?rev=33648&view=rev
Log: - add GetTraceEnableFlags prototype Modified: trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntrace.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re…
============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Thu May 22 15:26:53 2008 @@ -60,6 +60,7 @@ ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); +ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); #endif /* ENVTRACE_H */
16 years, 4 months
1
0
0
0
[fireball] 33647: - Actually remove the exports.
by fireball@svn.reactos.org
Author: fireball Date: Thu May 22 14:44:43 2008 New Revision: 33647 URL:
http://svn.reactos.org/svn/reactos?rev=33647&view=rev
Log: - Actually remove the exports. Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?…
============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Thu May 22 14:44:43 2008 @@ -3,9 +3,6 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache -CcRosReleaseFileCache -CcRosTraceCacheMap CcCanIWrite CcCopyRead CcCopyWrite @@ -960,7 +957,6 @@ READ_REGISTER_BUFFER_UCHAR READ_REGISTER_BUFFER_ULONG READ_REGISTER_BUFFER_USHORT -KiRosPrintAddress KeRosDumpStackFrames RtlAbsoluteToSelfRelativeSD RtlAddAccessAllowedAce Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def…
============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 22 14:44:43 2008 @@ -979,7 +979,6 @@ READ_REGISTER_BUFFER_UCHAR@12 READ_REGISTER_BUFFER_ULONG@12 READ_REGISTER_BUFFER_USHORT@12 -KiRosPrintAddress@4 KeRosDumpStackFrames@8 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16
16 years, 4 months
1
0
0
0
[fireball] 33646: Stefan Ginsberg <stefan__100__@hotmail.com> - Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too. - Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress.
by fireball@svn.reactos.org
Author: fireball Date: Thu May 22 14:31:49 2008 New Revision: 33646 URL:
http://svn.reactos.org/svn/reactos?rev=33646&view=rev
Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too. - Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress. Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def…
============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 22 14:31:49 2008 @@ -3,9 +3,6 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache@16 -CcRosReleaseFileCache@4 -CcRosTraceCacheMap@8 CcCanIWrite@16 CcCopyRead@24 CcCopyWrite@20 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Thu May 22 14:31:49 2008 @@ -1,6 +1,6 @@ #ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +NTSYSAPI VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); static int leak_reported = 0; @@ -79,14 +79,13 @@ DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", n); for (i = 0; i < n && h[i].count > 1; i++) { - int j; + /* Print out the allocation count */ DbgPrint(" %i allocs: ", h[i].count); - for (j = 0; j < GDI_STACK_LEVELS; j++) - { - ULONG Addr = GDIHandleAllocator[h[i].idx][j]; - if (!KiRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - } + + /* Dump the frames */ + KeRosDumpStackFrames(GDIHandleAllocator[h[i].idx], GDI_STACK_LEVELS); + + /* Print new line for better readability */ DbgPrint("\n"); } if (i < n && h[i].count == 1) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu May 22 14:31:49 2008 @@ -9,14 +9,8 @@ /** INCLUDES ******************************************************************/ #include <w32k.h> - #define NDEBUG #include <debug.h> - -/* FIXME include right header for KeRosDumpStackFrames */ -VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); - -//#define GDI_DEBUG #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -83,7 +77,7 @@ static LARGE_INTEGER ShortDelay; /** DEBUGGING *****************************************************************/ - +//#define GDI_DEBUG #include "gdidbg.c" /** INTERNAL FUNCTIONS ********************************************************/
16 years, 4 months
1
0
0
0
[janderwald] 33645: - fix integer to string representation - patch by Carlo Bramini - bug 2437
by janderwald@svn.reactos.org
Author: janderwald Date: Thu May 22 12:40:01 2008 New Revision: 33645 URL:
http://svn.reactos.org/svn/reactos?rev=33645&view=rev
Log: - fix integer to string representation - patch by Carlo Bramini - bug 2437 Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3…
============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu May 22 12:40:01 2008 @@ -182,8 +182,7 @@ ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) { TCHAR temp[32]; - INT c = 0; - INT n = 0; + UINT n, iTarget; if (len <= 1) return 0; @@ -192,24 +191,29 @@ { des[0] = _T('0'); des[1] = _T('\0'); - n = 1; - } - else - { - temp[31] = 0; - while (num.QuadPart > 0) - { - if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) - temp[30 - c++] = cThousandSeparator; - temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); - num.QuadPart /= 10; - } - if (c>len) - c=len; - - for (n = 0; n <= c; n++) - des[n] = temp[31 - c + n]; - } + return 1; + } + + n = 0; + iTarget = nNumberGroups; + if (!nNumberGroups) + bPutSeperator = FALSE; + + while (num.QuadPart > 0) + { + if (iTarget == n && bPutSeperator) + { + iTarget += nNumberGroups + 1; + temp[31 - n++] = cThousandSeparator; + } + temp[31 - n++] = (TCHAR)(num.QuadPart % 10) + _T('0'); + num.QuadPart /= 10; + } + if (n > len-1) + n = len-1; + + memcpy(des, temp + 32 - n, n * sizeof(TCHAR)); + des[n] = _T('\0'); return n; }
16 years, 4 months
1
0
0
0
[janderwald] 33644: - define _WMI_SOURCE_ macro - include evntrace header - implement stubs for GetTraceLoggerHandle and TraceEvent and also export them
by janderwald@svn.reactos.org
Author: janderwald Date: Thu May 22 12:23:47 2008 New Revision: 33644 URL:
http://svn.reactos.org/svn/reactos?rev=33644&view=rev
Log: - define _WMI_SOURCE_ macro - include evntrace header - implement stubs for GetTraceLoggerHandle and TraceEvent and also export them Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Thu May 22 12:23:47 2008 @@ -292,7 +292,7 @@ GetTokenInformation@20 ;GetTraceEnableFlags ;GetTraceEnableLevel -;GetTraceLoggerHandle +GetTraceLoggerHandle@4 GetTrusteeFormA@4 GetTrusteeFormW@4 GetTrusteeNameA@4 @@ -651,7 +651,7 @@ SystemFunction036@8 SystemFunction040@12 SystemFunction041@12 -;TraceEvent +TraceEvent@12 ;TraceEventInstance TraceMessage ;TraceMessageVa Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Thu May 22 12:23:47 2008 @@ -15,9 +15,11 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS +#define _WMI_SOURCE_ #include <windows.h> #include <accctrl.h> #include <aclapi.h> +#include <evntrace.h> #include <sddl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr…
============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Thu May 22 12:23:47 2008 @@ -20,4 +20,40 @@ return ERROR_SUCCESS; } +TRACEHANDLE +WMIAPI +GetTraceLoggerHandle( + PVOID Buffer +) +{ + DPRINT1("GetTraceLoggerHandle stub()\n"); + return (TRACEHANDLE)INVALID_HANDLE_VALUE; +} + + +ULONG +WMIAPI +TraceEvent( + TRACEHANDLE SessionHandle, + PEVENT_TRACE_HEADER EventTrace +) +{ + DPRINT1("TraceEvent stub()\n"); + + if (!SessionHandle || !EventTrace) + { + /* invalid parameters */ + return ERROR_INVALID_PARAMETER; + } + + if (EventTrace->Size != sizeof(EVENT_TRACE_HEADER)) + { + /* invalid parameter */ + return ERROR_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; +} + + /* EOF */
16 years, 4 months
1
0
0
0
[janderwald] 33643: - check if PEVENT_TRACE_HEADER is already defined - define WMIAPI macro - add TraceEvent, GetTraceLoogerHandler prototypes - PEVENT_TRACE_HEADER should not be defined in the NDK
by janderwald@svn.reactos.org
Author: janderwald Date: Thu May 22 12:12:42 2008 New Revision: 33643 URL:
http://svn.reactos.org/svn/reactos?rev=33643&view=rev
Log: - check if PEVENT_TRACE_HEADER is already defined - define WMIAPI macro - add TraceEvent, GetTraceLoogerHandler prototypes - PEVENT_TRACE_HEADER should not be defined in the NDK Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/ndk/exfuncs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=…
============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Thu May 22 12:12:42 2008 @@ -29,7 +29,10 @@ // // Don't include WMI headers just for one define // +#ifndef PEVENT_TRACE_HEADER_DEFINED +#define PEVENT_TRACE_HEADER_DEFINED typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER; +#endif #ifndef NTOS_MODE_USER // Modified: trunk/reactos/include/psdk/evntrace.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re…
============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Thu May 22 12:12:42 2008 @@ -1,5 +1,15 @@ -#ifndef ENVTRACE_H -#define ENVTRACE_H +#ifndef _EVNTRACE_ +#define _EVNTRACE_ + +#ifndef WMIAPI +#ifndef MIDL_PASS +#ifdef _WMI_SOURCE_ +#define WMIAPI __stdcall +#else +#define WMIAPI DECLSPEC_IMPORT __stdcall +#endif +#endif +#endif typedef struct _EVENT_TRACE_HEADER { @@ -37,7 +47,20 @@ }; ULONG64 ProcessorTime; }; -} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER; +} EVENT_TRACE_HEADER; + +#ifndef PEVENT_TRACE_HEADER_DEFINED +#define PEVENT_TRACE_HEADER_DEFINED +typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER; +#endif + + +typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; + + +ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); + #endif /* ENVTRACE_H */
16 years, 4 months
1
0
0
0
[cfinck] 33642: Change the Wiki to use the "menu.css" file
by cfinck@svn.reactos.org
Author: cfinck Date: Thu May 22 11:44:01 2008 New Revision: 33642 URL:
http://svn.reactos.org/svn/reactos?rev=33642&view=rev
Log: Change the Wiki to use the "menu.css" file Modified:
trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php
trunk/web/reactos.org/htdocs/wiki/skins/roscms/main.css
Modified:
trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/…
============================================================================== ---
trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php
[iso-8859-1] Thu May 22 11:44:01 2008 @@ -56,7 +56,7 @@ <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" /> <?php $this->html('headlinks') ?> <title><?php $this->text('pagetitle') ?></title> - <link href="/style.css" type="text/css" rel="stylesheet" /> + <link href="/css/menu.css" type="text/css" rel="stylesheet" /> <style type="text/css" media="screen, projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; Modified:
trunk/web/reactos.org/htdocs/wiki/skins/roscms/main.css
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/…
============================================================================== Binary files - no diff available.
16 years, 4 months
1
0
0
0
[cfinck] 33641: Part 2 of the phpBB 3.x RosCMS Integration - The Login System - Change the login_box function to use roscms_subsys_login and don't use the auto-refresh pages. - Change ucp.php to disable some commands, which have to be done by RosCMS and use the /roscms/?page=logout for logging out. - Write a new authorization module "roscms", make it the default at installation. - Remove all other authorization modules we don't need. - Remove the "Delete Board Cookies" feature (makes no sense as
by cfinck@svn.reactos.org
Author: cfinck Date: Thu May 22 11:22:57 2008 New Revision: 33641 URL:
http://svn.reactos.org/svn/reactos?rev=33641&view=rev
Log: Part 2 of the phpBB 3.x RosCMS Integration - The Login System - Change the login_box function to use roscms_subsys_login and don't use the auto-refresh pages. - Change ucp.php to disable some commands, which have to be done by RosCMS and use the /roscms/?page=logout for logging out. - Write a new authorization module "roscms", make it the default at installation. - Remove all other authorization modules we don't need. - Remove the "Delete Board Cookies" feature (makes no sense as it doesn't delete the RosCMS cookies) and the quick login on the board index. phpBB 3 is now ready for the Website! :-) Added:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
Removed:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
Modified:
trunk/web/reactos.org/htdocs/forum/
(props changed)
trunk/web/reactos.org/htdocs/forum/includes/functions.php
trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
trunk/web/reactos.org/htdocs/forum/ucp.php
Propchange:
trunk/web/reactos.org/htdocs/forum/
------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu May 22 11:22:57 2008 @@ -1,0 +1,1 @@ +config.php Removed:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_apache.php
(removed) @@ -1,241 +1,0 @@ -<?php -/** -* Apache auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* @package login -* @version $Id: auth_apache.php 8479 2008-03-29 00:22:48Z naderman $ -* @copyright (c) 2005 phpBB Group -* @license
http://opensource.org/licenses/gpl-license.php
GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* Checks whether the user is identified to apache -* Only allow changing authentication to apache if the user is identified -* Called in acp_board while setting authentication plugins -* -* @return boolean|string false if the user is identified and else an error message -*/ -function init_apache() -{ - global $user; - - if (!isset($_SERVER['PHP_AUTH_USER']) || $user->data['username'] !== $_SERVER['PHP_AUTH_USER']) - { - return $user->lang['APACHE_SETUP_BEFORE_USE']; - } - return false; -} - -/** -* Login function -*/ -function login_apache(&$username, &$password) -{ - global $db; - - // do not allow empty password - if (!$password) - { - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - if (!$username) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $php_auth_user = $_SERVER['PHP_AUTH_USER']; - $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - - if (!empty($php_auth_user) && !empty($php_auth_pw)) - { - if ($php_auth_user !== $username) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type - FROM ' . USERS_TABLE . " - WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - - // this is the user's first login so create an empty profile - return array( - 'status' => LOGIN_SUCCESS_CREATE_PROFILE, - 'error_msg' => false, - 'user_row' => user_row_apache($php_auth_user, $php_auth_pw), - ); - } - - // Not logged into apache - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', - 'user_row' => array('user_id' => ANONYMOUS), - ); -} - -/** -* Autologin function -* -* @return array containing the user row or empty if no auto login should take place -*/ -function autologin_apache() -{ - global $db; - - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return array(); - } - - $php_auth_user = $_SERVER['PHP_AUTH_USER']; - $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - - if (!empty($php_auth_user) && !empty($php_auth_pw)) - { - set_var($php_auth_user, $php_auth_user, 'string'); - set_var($php_auth_pw, $php_auth_pw, 'string'); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; - } - - if (!function_exists('user_add')) - { - global $phpbb_root_path, $phpEx; - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - // create the user if he does not exist yet - user_add(user_row_apache($php_auth_user, $php_auth_pw)); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return $row; - } - } - - return array(); -} - -/** -* This function generates an array which can be passed to the user_add function in order to create a user -*/ -function user_row_apache($username, $password) -{ - global $db, $config, $user; - // first retrieve default group id - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape('REGISTERED') . "' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - // generate user account data - return array( - 'username' => $username, - 'user_password' => phpbb_hash($password), - 'user_email' => '', - 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, - 'user_ip' => $user->ip, - ); -} - -/** -* The session validation function checks whether the user is still logged in -* -* @return boolean true if the given user is authenticated or false if the session should be closed -*/ -function validate_session_apache(&$user) -{ - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return false; - } - - $php_auth_user = ''; - set_var($php_auth_user, $_SERVER['PHP_AUTH_USER'], 'string'); - - return ($php_auth_user === $user['username']) ? true : false; -} - -?> Removed:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_db.php
(removed) @@ -1,235 +1,0 @@ -<?php -/** -* Database auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* This is for authentication via the integrated user table -* -* @package login -* @version $Id: auth_db.php 8479 2008-03-29 00:22:48Z naderman $ -* @copyright (c) 2005 phpBB Group -* @license
http://opensource.org/licenses/gpl-license.php
GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* Login function -*/ -function login_db(&$username, &$password) -{ - global $db, $config; - - // do not allow empty password - if (!$password) - { - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - if (!$username) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - // If there are too much login attempts, we need to check for an confirm image - // Every auth module is able to define what to do by itself... - if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) - { - $confirm_id = request_var('confirm_id', ''); - $confirm_code = request_var('confirm_code', ''); - - // Visual Confirmation handling - if (!$confirm_id) - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'LOGIN_ERROR_ATTEMPTS', - 'user_row' => $row, - ); - } - else - { - global $user; - - $sql = 'SELECT code - FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $result = $db->sql_query($sql); - $confirm_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($confirm_row) - { - if (strcasecmp($confirm_row['code'], $confirm_code) === 0) - { - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $db->sql_query($sql); - } - else - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'CONFIRM_CODE_WRONG', - 'user_row' => $row, - ); - } - } - else - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'CONFIRM_CODE_WRONG', - 'user_row' => $row, - ); - } - } - } - - // If the password convert flag is set we need to convert it - if ($row['user_pass_convert']) - { - // in phpBB2 passwords were used exactly as they were sent, with addslashes applied - $password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : ''; - $password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; - $password_new_format = ''; - - set_var($password_new_format, stripslashes($password_old_format), 'string'); - - if ($password == $password_new_format) - { - if (!function_exists('utf8_to_cp1252')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); - } - - // cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding - if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']) - { - $hash = phpbb_hash($password_new_format); - - // Update the password in the users table to the new format and remove user_pass_convert flag - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_password = \'' . $db->sql_escape($hash) . '\', - user_pass_convert = 0 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - $row['user_pass_convert'] = 0; - $row['user_password'] = $hash; - } - else - { - // Although we weren't able to convert this password we have to - // increase login attempt count to make sure this cannot be exploited - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = user_login_attempts + 1 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - return array( - 'status' => LOGIN_ERROR_PASSWORD_CONVERT, - 'error_msg' => 'LOGIN_ERROR_PASSWORD_CONVERT', - 'user_row' => $row, - ); - } - } - } - - // Check password ... - if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password'])) - { - // Check for old password hash... - if (strlen($row['user_password']) == 32) - { - $hash = phpbb_hash($password); - - // Update the password in the users table to the new format - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_password = '" . $db->sql_escape($hash) . "', - user_pass_convert = 0 - WHERE user_id = {$row['user_id']}"; - $db->sql_query($sql); - - $row['user_password'] = $hash; - } - - if ($row['user_login_attempts'] != 0) - { - // Successful, reset login attempts (the user passed all stages) - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = 0 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - } - - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... set user_login_attempts to zero... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - - // Password incorrect - increase login attempts - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = user_login_attempts + 1 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - // Give status about wrong password... - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'LOGIN_ERROR_PASSWORD', - 'user_row' => $row, - ); -} - -?> Removed:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_ldap.php
(removed) @@ -1,343 +1,0 @@ -<?php -/** -* -* LDAP auth plug-in for phpBB3 -* -* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. -* -* @package login -* @version $Id: auth_ldap.php 8479 2008-03-29 00:22:48Z naderman $ -* @copyright (c) 2005 phpBB Group -* @license
http://opensource.org/licenses/gpl-license.php
GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* Connect to ldap server -* Only allow changing authentication to ldap if we can connect to the ldap server -* Called in acp_board while setting authentication plugins -*/ -function init_ldap() -{ - global $config, $user; - - if (!@extension_loaded('ldap')) - { - return $user->lang['LDAP_NO_LDAP_EXTENSION']; - } - - $config['ldap_port'] = (int) $config['ldap_port']; - if ($config['ldap_port']) - { - $ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); - } - else - { - $ldap = @ldap_connect($config['ldap_server']); - } - - if (!$ldap) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - - @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - - if ($config['ldap_user'] || $config['ldap_password']) - { - if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) - { - return $user->lang['LDAP_INCORRECT_USER_PASSWORD']; - } - } - - // ldap_connect only checks whether the specified server is valid, so the connection might still fail - $search = @ldap_search( - $ldap, - $config['ldap_base_dn'], - ldap_user_filter($user->data['username']), - (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), - 0, - 1 - ); - - if ($search === false) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - - $result = @ldap_get_entries($ldap, $search); - - @ldap_close($ldap); - - - if (!is_array($result) || sizeof($result) < 2) - { - return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']); - } - - if (!empty($config['ldap_email']) && !isset($result[0][$config['ldap_email']])) - { - return $user->lang['LDAP_NO_EMAIL']; - } - - return false; -} - -/** -* Login function -*/ -function login_ldap(&$username, &$password) -{ - global $db, $config, $user; - - // do not allow empty password - if (!$password) - { - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - if (!$username) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - if (!@extension_loaded('ldap')) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LDAP_NO_LDAP_EXTENSION', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $config['ldap_port'] = (int) $config['ldap_port']; - if ($config['ldap_port']) - { - $ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); - } - else - { - $ldap = @ldap_connect($config['ldap_server']); - } - - if (!$ldap) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LDAP_NO_SERVER_CONNECTION', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - - if ($config['ldap_user'] || $config['ldap_password']) - { - if (!@ldap_bind($ldap, $config['ldap_user'], htmlspecialchars_decode($config['ldap_password']))) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - } - - $search = @ldap_search( - $ldap, - $config['ldap_base_dn'], - ldap_user_filter($username), - (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), - 0, - 1 - ); - - $ldap_result = @ldap_get_entries($ldap, $search); - - if (is_array($ldap_result) && sizeof($ldap_result) > 1) - { - if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password))) - { - @ldap_close($ldap); - - $sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - unset($ldap_result); - - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... set user_login_attempts to zero... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - else - { - // retrieve default group id - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape('REGISTERED') . "' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - // generate user account data - $ldap_user_row = array( - 'username' => $username, - 'user_password' => phpbb_hash($password), - 'user_email' => (!empty($config['ldap_email'])) ? $ldap_result[0][$config['ldap_email']][0] : '', - 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, - 'user_ip' => $user->ip, - ); - - unset($ldap_result); - - // this is the user's first login so create an empty profile - return array( - 'status' => LOGIN_SUCCESS_CREATE_PROFILE, - 'error_msg' => false, - 'user_row' => $ldap_user_row, - ); - } - } - else - { - unset($ldap_result); - @ldap_close($ldap); - - // Give status about wrong password... - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'LOGIN_ERROR_PASSWORD', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - } - - @ldap_close($ldap); - - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); -} - -/** -* Generates a filter string for ldap_search to find a user -* -* @param $username string Username identifying the searched user -* -* @return string A filter string for ldap_search -*/ -function ldap_user_filter($username) -{ - global $config; - - $filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; - if ($config['ldap_user_filter']) - { - $filter = "(&$filter({$config['ldap_user_filter']}))"; - } - return $filter; -} - -/** -* Escapes an LDAP AttributeValue -*/ -function ldap_escape($string) -{ - return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); -} - -/** -* This function is used to output any required fields in the authentication -* admin panel. It also defines any required configuration table fields. -*/ -function acp_ldap(&$new) -{ - global $user; - - $tpl = ' - - <dl> - <dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . ':</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . ':</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . ':</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . ':</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd> - </dl> - <dl> - <dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . ':</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt> - <dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" /></dd> - </dl> - '; - - // These are fields required in the config table - return array( - 'tpl' => $tpl, - 'config' => array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password') - ); -} - -?> Added:
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
(added) +++
trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -1,0 +1,103 @@ +<?php +/** +* RosCMS auth plug-in for phpBB3 +* Written by Colin Finck (mail(a)colinfinck.de) based on the DB plug-in +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +/** +* Login function +*/ +define(ROSCMS_DB_NAME, "roscms"); + +function login_roscms(&$userid, &$password) +{ + global $db, $config; + + // We only check the User ID here. + if (!$userid) + { + return array( + 'status' => LOGIN_ERROR_USERNAME, + 'error_msg' => 'LOGIN_ERROR_USERNAME', + 'user_row' => array('user_id' => ANONYMOUS), + ); + } + + // Get the phpBB ID of the user belonging to the "roscmsusrkey" cookie + $sql = "SELECT m.map_subsys_userid " . + "FROM " . ROSCMS_DB_NAME . ".user_sessions s, " . ROSCMS_DB_NAME . ".users u, " . ROSCMS_DB_NAME . ".subsys_mappings m " . + "WHERE s.usersession_id = '" . $db->sql_escape($_COOKIE["roscmsusrkey"]) . "' AND (s.usersession_expires IS NULL OR NOW() <= s.usersession_expires) " . + "AND u.user_id = s.usersession_user_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress = '" . $db->sql_escape($_SERVER["REMOTE_ADDR"]) . "') " . + "AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = '" . $db->sql_escape($_SERVER["HTTP_USER_AGENT"]) . "') " . + "AND m.map_roscms_userid = s.usersession_user_id " . + "AND m.map_subsys_name = 'phpbb'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + // Verify this ID against $userid + if(!$row || $row["map_subsys_userid"] != $userid) + { + return array( + 'status' => LOGIN_ERROR_USERNAME, + 'error_msg' => 'LOGIN_ERROR_USERNAME', + 'user_row' => array('user_id' => ANONYMOUS), + ); + } + + // Now get the user information based on this ID + $sql = "SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts " . + "FROM " . USERS_TABLE . " " . + "WHERE user_id = " . (int)$userid; + + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if (!$row) + { + return array( + 'status' => LOGIN_ERROR_USERNAME, + 'error_msg' => 'LOGIN_ERROR_USERNAME', + 'user_row' => array('user_id' => ANONYMOUS), + ); + } + + // User inactive... + if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) + { + return array( + 'status' => LOGIN_ERROR_ACTIVE, + 'error_msg' => 'ACTIVE_ERROR', + 'user_row' => $row, + ); + } + + // Successful login + return array( + 'status' => LOGIN_SUCCESS, + 'error_msg' => false, + 'user_row' => $row, + ); +} + +function validate_session_roscms(&$user) +{ + if($user["user_id"] == ANONYMOUS && $_COOKIE["roscmsusrkey"] != "") + { + // The user is logged in in RosCMS, but not yet in phpBB. Do that now + login_box(); + } + + return true; +} + +?> Modified:
trunk/web/reactos.org/htdocs/forum/includes/functions.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/includes/functions.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/includes/functions.php
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -15,6 +15,8 @@ { exit; } + +require_once("$phpbb_root_path/../roscms/inc/subsys_login.php"); // Common global functions @@ -2256,211 +2258,49 @@ trigger_error('NO_AUTH_ADMIN'); } - if (isset($_POST['login'])) - { - // Get credential - if ($admin) - { - $credential = request_var('credential', ''); - - if (strspn($credential, 'abcdef0123456789') !== strlen($credential) || strlen($credential) != 32) - { - if ($user->data['is_registered']) - { - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - } - trigger_error('NO_AUTH_ADMIN'); - } - - $password = request_var('password_' . $credential, '', true); + // Login using RosCMS + // The function will return the phpBB user ID if we're already logged in. + // Otherwise this function will be automatically called again through validate_session_roscms, when we will be redirected to the forum. + $userid = roscms_subsys_login("phpbb", ROSCMS_LOGIN_REQUIRED, "/forum"); + + // If authentication is successful we redirect user to previous page + $result = $auth->login($userid, '', true, true, $admin); + + // If admin authentication and login, we will log if it was a success or not... + // We also break the operation on the first non-success login - it could be argued that the user already knows + if ($admin) + { + if ($result['status'] == LOGIN_SUCCESS) + { + add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS'); } else { - $password = request_var('password', '', true); - } - - $username = request_var('username', '', true); - $autologin = (!empty($_POST['autologin'])) ? true : false; - $viewonline = (!empty($_POST['viewonline'])) ? 0 : 1; - $admin = ($admin) ? 1 : 0; - $viewonline = ($admin) ? $user->data['session_viewonline'] : $viewonline; - - // Check if the supplied username is equal to the one stored within the database if re-authenticating - if ($admin && utf8_clean_string($username) != utf8_clean_string($user->data['username'])) - { - // We log the attempt to use a different username... - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - trigger_error('NO_AUTH_ADMIN_USER_DIFFER'); - } - - // If authentication is successful we redirect user to previous page - $result = $auth->login($username, $password, $autologin, $viewonline, $admin); - - // If admin authentication and login, we will log if it was a success or not... - // We also break the operation on the first non-success login - it could be argued that the user already knows - if ($admin) - { - if ($result['status'] == LOGIN_SUCCESS) - { - add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS'); - } - else - { - // Only log the failed attempt if a real user tried to. - // anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions - if ($user->data['is_registered']) - { - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - } - } - } - - // The result parameter is always an array, holding the relevant information... - if ($result['status'] == LOGIN_SUCCESS) - { - $redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx"); - $message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT']; - $l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect === "{$phpbb_root_path}index.$phpEx" || $redirect === "index.$phpEx") ? $user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']); - - // append/replace SID (may change during the session for AOL users) - $redirect = reapply_sid($redirect); - - // Special case... the user is effectively banned, but we allow founders to login - if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != USER_FOUNDER) - { - return; - } - - meta_refresh(3, $redirect); - trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>')); - } - - // Something failed, determine what... - if ($result['status'] == LOGIN_BREAK) - { - trigger_error($result['error_msg']); - } - - // Special cases... determine - switch ($result['status']) - { - case LOGIN_ERROR_ATTEMPTS: - - // Show confirm image - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $db->sql_query($sql); - - // Generate code - $code = gen_rand_string(mt_rand(5, 8)); - $confirm_id = md5(unique_id($user->ip)); - $seed = hexdec(substr(unique_id(), 4, 10)); - - // compute $seed % 0x7fffffff - $seed -= 0x7fffffff * floor($seed / 0x7fffffff); - - $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'confirm_id' => (string) $confirm_id, - 'session_id' => (string) $user->session_id, - 'confirm_type' => (int) CONFIRM_LOGIN, - 'code' => (string) $code, - 'seed' => (int) $seed) - ); - $db->sql_query($sql); - - $template->assign_vars(array( - 'S_CONFIRM_CODE' => true, - 'CONFIRM_ID' => $confirm_id, - 'CONFIRM_IMAGE' => '<img src="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&id=' . $confirm_id . '&type=' . CONFIRM_LOGIN) . '" alt="" title="" />', - 'L_LOGIN_CONFIRM_EXPLAIN' => sprintf($user->lang['LOGIN_CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'), - )); - - $err = $user->lang[$result['error_msg']]; - - break; - - case LOGIN_ERROR_PASSWORD_CONVERT: - $err = sprintf( - $user->lang[$result['error_msg']], - ($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '', - ($config['email_enable']) ? '</a>' : '', - ($config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">' : '', - ($config['board_contact']) ? '</a>' : '' - ); - break; - - // Username, password, etc... - default: - $err = $user->lang[$result['error_msg']]; - - // Assign admin contact to some error messages - if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD') - { - $err = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'); - } - - break; - } - } - - if (!$redirect) - { - // We just use what the session code determined... - // If we are not within the admin directory we use the page dir... - $redirect = ''; - - if (!$admin) - { - $redirect .= ($user->page['page_dir']) ? $user->page['page_dir'] . '/' : ''; - } - - $redirect .= $user->page['page_name'] . (($user->page['query_string']) ? '?' . htmlspecialchars($user->page['query_string']) : ''); - } - - // Assign credential for username/password pair - $credential = ($admin) ? md5(unique_id()) : false; - - $s_hidden_fields = array( - 'redirect' => $redirect, - 'sid' => $user->session_id, - ); - - if ($admin) - { - $s_hidden_fields['credential'] = $credential; - } - - $s_hidden_fields = build_hidden_fields($s_hidden_fields); - - $template->assign_vars(array( - 'LOGIN_ERROR' => $err, - 'LOGIN_EXPLAIN' => $l_explain, - - 'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '', - 'U_RESEND_ACTIVATION' => ($config['require_activation'] != USER_ACTIVATION_NONE && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '', - 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), - 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), - - 'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false, - 'S_LOGIN_ACTION' => (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - - 'S_ADMIN_AUTH' => $admin, - 'USERNAME' => ($admin) ? $user->data['username'] : '', - - 'USERNAME_CREDENTIAL' => 'username', - 'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password', - )); - - page_header($user->lang['LOGIN'], false); - - $template->set_filenames(array( - 'body' => 'login_body.html') - ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); + // Only log the failed attempt if a real user tried to. + // anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions + if ($user->data['is_registered']) + { + add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); + } + } + } + + // The result parameter is always an array, holding the relevant information... + if ($result['status'] == LOGIN_SUCCESS) + { + $redirect = $admin ? "{$phpbb_root_path}adm/index.$phpEx" : "{$phpbb_root_path}index.$phpEx"; + + // append/replace SID (may change during the session for AOL users) + $redirect = reapply_sid($redirect); + + // Special case... the user is effectively banned, but we allow founders to login + if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != USER_FOUNDER) + { + return; + } + + header("Location: $redirect"); + } } /** Modified:
trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/insta…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -37,7 +37,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method', 'db'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method', 'roscms'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize', '6144'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path', 'images/avatars/gallery'); Modified:
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/index_body.html
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -13,20 +13,6 @@ <!-- ENDIF --> <!-- INCLUDE forumlist_body.html --> - -<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> - <form method="post" action="{S_LOGIN_ACTION}" class="headerspace"> - <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --> • <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3> - <fieldset class="quick-login"> - <label for="username">{L_USERNAME}:</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /> - <label for="password">{L_PASSWORD}:</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /> - <!-- IF S_AUTOLOGIN_ENABLED --> - | <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label> - <!-- ENDIF --> - <input type="submit" name="login" value="{L_LOGIN}" class="button2" /> - </fieldset> - </form> -<!-- ENDIF --> <!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF --> Modified:
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht…
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -13,7 +13,7 @@ <!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> <!-- ENDIF --> - <li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> • <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> • <!-- ENDIF -->{S_TIMEZONE}</li> + <li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> • {S_TIMEZONE}</li> </ul> <span class="corners-bottom"><span></span></span></div> Modified:
trunk/web/reactos.org/htdocs/forum/ucp.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/ucp.p…
============================================================================== ---
trunk/web/reactos.org/htdocs/forum/ucp.php
[iso-8859-1] (original) +++
trunk/web/reactos.org/htdocs/forum/ucp.php
[iso-8859-1] Thu May 22 11:22:57 2008 @@ -41,35 +41,20 @@ switch ($mode) { case 'activate': - $module->load('ucp', 'activate'); - $module->display($user->lang['UCP_ACTIVATE']); - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - break; - + case 'confirm': + case 'delete_cookies': case 'resend_act': - $module->load('ucp', 'resend'); - $module->display($user->lang['UCP_RESEND']); - break; - case 'sendpassword': - $module->load('ucp', 'remind'); - $module->display($user->lang['UCP_REMIND']); - break; + die("Please go to RosCMS to do this!"); case 'register': if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) { redirect(append_sid("{$phpbb_root_path}index.$phpEx")); } - - $module->load('ucp', 'register'); - $module->display($user->lang['REGISTER']); - break; - - case 'confirm': - $module->load('ucp', 'confirm'); - exit_handler(); + + header("Location: /roscms/?page=register&target=/forum"); + exit; break; case 'login': @@ -86,7 +71,8 @@ { $user->session_kill(); $user->session_begin(); - $message = $user->lang['LOGOUT_REDIRECT']; + header("Location: /roscms/?page=logout"); + exit; } else { @@ -134,47 +120,6 @@ break; - case 'delete_cookies': - - // Delete Cookies with dynamic names (do NOT delete poll cookies) - if (confirm_box(true)) - { - $set_time = time() - 31536000; - - foreach ($_COOKIE as $cookie_name => $cookie_data) - { - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); - - // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ - if (strpos($cookie_name, 'poll_') !== 0) - { - $user->set_cookie($cookie_name, '', $set_time); - } - } - - $user->set_cookie('track', '', $set_time); - $user->set_cookie('u', '', $set_time); - $user->set_cookie('k', '', $set_time); - $user->set_cookie('sid', '', $set_time); - - // We destroy the session here, the user will be logged out nevertheless - $user->session_kill(); - $user->session_begin(); - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>'); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_COOKIES', ''); - } - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - - break; - case 'switch_perm': $user_id = request_var('u', 0);
16 years, 4 months
1
0
0
0
[tkreuzer] 33640: implement SPI_GET/SETSTICKYKEYS, SPI_GET/SETFILTERKEYS, SPI_GET/SETTOGGLEKEYS, SPI_GET/SETSERIALKEYS, SPI_GET/SETMOUSEKEYS, SPI_GET/SETKEYBOARDPREF, SPI_GET/SETSHOWSOUNDS, SPI_GET/SETACCESSTIMEOUT makes access.cpl start again. See issue #3133 for more details.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu May 22 09:51:01 2008 New Revision: 33640 URL:
http://svn.reactos.org/svn/reactos?rev=33640&view=rev
Log: implement SPI_GET/SETSTICKYKEYS, SPI_GET/SETFILTERKEYS, SPI_GET/SETTOGGLEKEYS, SPI_GET/SETSERIALKEYS, SPI_GET/SETMOUSEKEYS, SPI_GET/SETKEYBOARDPREF, SPI_GET/SETSHOWSOUNDS, SPI_GET/SETACCESSTIMEOUT makes access.cpl start again. See issue #3133 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Thu May 22 09:51:01 2008 @@ -65,6 +65,14 @@ static UINT FocusBorderHeight = 1; static UINT FocusBorderWidth = 1; static ANIMATIONINFO anim; + static STICKYKEYS StickyKeys = {sizeof(STICKYKEYS), 0x1fa}; + static FILTERKEYS FilterKeys = {sizeof(FILTERKEYS), 0, 0, 0, 0, 0}; + static TOGGLEKEYS ToggleKeys = {sizeof(TOGGLEKEYS), 0}; + static MOUSEKEYS MouseKeys = {sizeof(MOUSEKEYS), 0, 0, 0, 0, 0, 0}; + static BOOL KeyboardPref = FALSE; + static BOOL ShowSounds = FALSE; + static ACCESSTIMEOUT AccessTimeout = {sizeof(ACCESSTIMEOUT), 0, 0}; + static SERIALKEYS SerialKeys = {sizeof(SERIALKEYS), 0, 0, 0, 0, 0, 0}; if (!bInitialized) { @@ -587,6 +595,94 @@ case SPI_SETFOCUSBORDERWIDTH: { FocusBorderWidth = (UINT)pvParam; + bChanged = TRUE; + break; + } + case SPI_GETSTICKYKEYS: + { + *((STICKYKEYS*)pvParam) = StickyKeys; + break; + } + case SPI_SETSTICKYKEYS: + { + StickyKeys = *((STICKYKEYS*)pvParam); + bChanged = TRUE; + break; + } + case SPI_GETFILTERKEYS: + { + *((FILTERKEYS*)pvParam) = FilterKeys; + break; + } + case SPI_SETFILTERKEYS: + { + FilterKeys = *((FILTERKEYS*)pvParam); + bChanged = TRUE; + break; + } + case SPI_GETTOGGLEKEYS: + { + *((TOGGLEKEYS*)pvParam) = ToggleKeys; + break; + } + case SPI_SETTOGGLEKEYS: + { + ToggleKeys = *((TOGGLEKEYS*)pvParam); + bChanged = TRUE; + break; + } + case SPI_GETSERIALKEYS: + { + *((SERIALKEYS*)pvParam) = SerialKeys; + break; + } + case SPI_SETSERIALKEYS: + { + SerialKeys = *((SERIALKEYS*)pvParam); + bChanged = TRUE; + break; + } + case SPI_GETMOUSEKEYS: + { + *((MOUSEKEYS*)pvParam) = MouseKeys; + break; + } + case SPI_SETMOUSEKEYS: + { + MouseKeys = *((MOUSEKEYS*)pvParam); + bChanged = TRUE; + break; + } + case SPI_GETKEYBOARDPREF: + { + *((BOOL*)pvParam) = KeyboardPref; + break; + } + case SPI_SETKEYBOARDPREF: + { + KeyboardPref = (BOOL)uiParam; + bChanged = TRUE; + break; + } + case SPI_GETSHOWSOUNDS: + { + *((BOOL*)pvParam) = ShowSounds; + break; + } + case SPI_SETSHOWSOUNDS: + { + ShowSounds = (BOOL)uiParam; + bChanged = TRUE; + break; + } + case SPI_GETACCESSTIMEOUT: + { + *((ACCESSTIMEOUT*)pvParam) = AccessTimeout; + break; + } + case SPI_SETACCESSTIMEOUT: + { + AccessTimeout = *((ACCESSTIMEOUT*)pvParam); bChanged = TRUE; break; }
16 years, 4 months
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
59
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Results per page:
10
25
50
100
200