Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 20997: use DrawEdge to draw the splitter
by cwittich＠svn.reactos.org 23 Jan '06

23 Jan '06

use DrawEdge to draw the splitter added WS_EX_CLIENTEDGE to MDI ChildWindow Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-22 23:42:45 UTC (rev 20996) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-23 00:13:14 UTC (rev 20997) @@ -535,7 +535,7 @@ if (_hwndrebar) { int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; - rect.top += 4; + rect.top += 5; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -729,7 +729,7 @@ ccs.hWindowMenu = _hMenuWindow; ccs.idFirstChild = IDW_FIRST_CHILD; - _hmdiclient = CreateWindowEx(0, TEXT("MDICLIENT"), NULL, + _hmdiclient = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("MDICLIENT"), NULL, WS_CHILD|WS_CLIPCHILDREN|WS_VSCROLL|WS_HSCROLL|WS_VISIBLE|WS_BORDER, 0, 0, 0, 0, hwnd, 0, g_Globals._hInstance, &ccs); @@ -1215,7 +1215,7 @@ if (_hwndrebar) { int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; - rect.top += 4; + rect.top += 5; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -1270,7 +1270,7 @@ SetWindowPos(_hsidebar, 0, -1, rect.top-1, rt.right-rt.left, rect.bottom-rect.top+1, SWP_NOACTIVATE|SWP_NOZORDER); } - MoveWindow(_hmdiclient, rect.left-1, rect.top-1, rect.right-rect.left+2, rect.bottom-rect.top+1, TRUE); + MoveWindow(_hmdiclient, rect.left-1, rect.top-1, rect.right-rect.left+1, rect.bottom-rect.top+1, TRUE); } bool MDIMainFrame::activate_drive_window(LPCTSTR path) @@ -1575,7 +1575,7 @@ if (_hwndrebar) { int height = ClientRect(_hwndrebar).bottom; rect.top += height; - rect.top += 4; + rect.top += 5; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -1658,7 +1658,7 @@ ClientRect rect(_hwnd); _left_hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, - WS_CHILD|WS_TABSTOP|WS_VISIBLE|WS_CHILD|TVS_HASLINES|TVS_LINESATROOT|TVS _HASBUTTONS|TVS_NOTOOLTIPS|TVS_SHOWSELALWAYS, + WS_CHILD|WS_TABSTOP|WS_VISIBLE|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTO NS|TVS_NOTOOLTIPS|TVS_SHOWSELALWAYS, 0, rect.top, split_pos-SPLIT_WIDTH/2, rect.bottom-rect.top, _hwnd, (HMENU)IDC_FILETREE, g_Globals._hInstance, 0); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-22 23:42:45 UTC (rev 20996) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-23 00:13:14 UTC (rev 20997) @@ -683,7 +683,7 @@ ClientRect rect(_hwnd); _left_hwnd = CreateWindowEx(0, WC_TREEVIEW, NULL, - WS_CHILD|WS_TABSTOP|WS_VISIBLE|WS_CHILD|TVS_HASLINES|TVS_LINESATROOT|TVS _HASBUTTONS|TVS_SHOWSELALWAYS,//|TVS_NOTOOLTIPS + WS_CHILD|WS_TABSTOP|WS_VISIBLE|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTO NS|TVS_SHOWSELALWAYS,//|TVS_NOTOOLTIPS 0, rect.top, split_pos-SPLIT_WIDTH/2, rect.bottom-rect.top, _hwnd, (HMENU)IDC_FILETREE, g_Globals._hInstance, 0); }

1 0

[gedmurphy] 20996: remove unneeded loop check
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

remove unneeded loop check Modified: trunk/reactos/subsys/system/servman/control.c Modified: trunk/reactos/subsys/system/servman/servman.h Modified: trunk/reactos/subsys/system/servman/start.c _____ Modified: trunk/reactos/subsys/system/servman/control.c --- trunk/reactos/subsys/system/servman/control.c 2006-01-22 23:35:43 UTC (rev 20995) +++ trunk/reactos/subsys/system/servman/control.c 2006-01-22 23:42:45 UTC (rev 20996) @@ -22,7 +22,6 @@ SERVICE_STATUS Status; LVITEM item; DWORD BytesNeeded = 0; - DWORD Loop = 5; //FIXME: testing value. needs better control DWORD dwStartTickCount, dwOldCheckPoint; item.mask = LVIF_PARAM; @@ -34,7 +33,7 @@ /* set the progress bar range and step */ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); - SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, PROGRESSRANGE)); SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); /* open handle to the SCM */ @@ -79,7 +78,7 @@ /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState != Control || !Loop) + while (ServiceStatus.dwCurrentState != Control) { DWORD dwWaitTime; @@ -129,7 +128,7 @@ if (ServiceStatus.dwCurrentState == Control) { - SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + SendMessage(hProgBar, PBM_DELTAPOS, PROGRESSRANGE, 0); Sleep(1000); return TRUE; } _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-22 23:35:43 UTC (rev 20995) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-22 23:42:45 UTC (rev 20996) @@ -11,6 +11,7 @@ #define MAX_KEY_LENGTH 256 #define NUM_BUTTONS 13 +#define PROGRESSRANGE 8 BOOL RefreshServiceList(VOID); _____ Modified: trunk/reactos/subsys/system/servman/start.c --- trunk/reactos/subsys/system/servman/start.c 2006-01-22 23:35:43 UTC (rev 20995) +++ trunk/reactos/subsys/system/servman/start.c 2006-01-22 23:42:45 UTC (rev 20996) @@ -21,7 +21,6 @@ ENUM_SERVICE_STATUS_PROCESS *Service = NULL; DWORD BytesNeeded = 0; INT ArgCount = 0; - DWORD Loop = 5; //FIXME: testing value. needs better control DWORD dwStartTickCount, dwOldCheckPoint; /* copy pointer to selected service */ @@ -29,7 +28,7 @@ /* set the progress bar range and step */ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); - SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, PROGRESSRANGE)); SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); /* open handle to the SCM */ @@ -72,7 +71,7 @@ /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING || !Loop) + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) { DWORD dwWaitTime; @@ -122,7 +121,7 @@ if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { - SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + SendMessage(hProgBar, PBM_DELTAPOS, PROGRESSRANGE, 0); Sleep(1000); return TRUE; }

1 0

[gedmurphy] 20995: - Improve start / stop control
by gedmurphy＠svn.reactos.org 22 Jan '06

22 Jan '06

- Improve start / stop control - Use GetSelectedService exclusively Modified: trunk/reactos/subsys/system/servman/control.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/start.c _____ Modified: trunk/reactos/subsys/system/servman/control.c --- trunk/reactos/subsys/system/servman/control.c 2006-01-22 23:29:53 UTC (rev 20994) +++ trunk/reactos/subsys/system/servman/control.c 2006-01-22 23:35:43 UTC (rev 20995) @@ -23,6 +23,7 @@ LVITEM item; DWORD BytesNeeded = 0; DWORD Loop = 5; //FIXME: testing value. needs better control + DWORD dwStartTickCount, dwOldCheckPoint; item.mask = LVIF_PARAM; item.iItem = GetSelectedItem(); @@ -72,15 +73,28 @@ return FALSE; } + /* Save the tick count and initial checkpoint. */ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ while (ServiceStatus.dwCurrentState != Control || !Loop) { + DWORD dwWaitTime; + + dwWaitTime = ServiceStatus.dwWaitHint / 10; + + if( dwWaitTime < 500 ) + dwWaitTime = 500; + else if ( dwWaitTime > 5000 ) + dwWaitTime = 5000; + /* increment the progress bar */ SendMessage(hProgBar, PBM_STEPIT, 0, 0); /* wait before checking status */ - Sleep(ServiceStatus.dwWaitHint / 8); + Sleep(dwWaitTime); /* check status again */ if (! QueryServiceStatusEx( @@ -93,7 +107,22 @@ GetError(0); return FALSE; } - Loop--; + + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* The service is making progress. increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) + { + /* No progress made within the wait hint */ + break; + } + } } CloseServiceHandle(hSc); _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-22 23:29:53 UTC (rev 20994) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-22 23:35:43 UTC (rev 20995) @@ -96,15 +96,10 @@ SC_HANDLE hSc = NULL; LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - LVITEM item; DWORD BytesNeeded = 0; - item.mask = LVIF_PARAM; - item.iItem = GetSelectedItem(); - SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); - /* copy pointer to selected service */ - Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + Service = GetSelectedService(); /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); _____ Modified: trunk/reactos/subsys/system/servman/start.c --- trunk/reactos/subsys/system/servman/start.c 2006-01-22 23:29:53 UTC (rev 20994) +++ trunk/reactos/subsys/system/servman/start.c 2006-01-22 23:35:43 UTC (rev 20995) @@ -19,17 +19,13 @@ SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - LVITEM item; DWORD BytesNeeded = 0; INT ArgCount = 0; DWORD Loop = 5; //FIXME: testing value. needs better control + DWORD dwStartTickCount, dwOldCheckPoint; - item.mask = LVIF_PARAM; - item.iItem = GetSelectedItem(); - SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); - /* copy pointer to selected service */ - Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + Service = GetSelectedService(); /* set the progress bar range and step */ hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); @@ -70,10 +66,23 @@ return FALSE; } + /* Save the tick count and initial checkpoint. */ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ while (ServiceStatus.dwCurrentState != SERVICE_RUNNING || !Loop) { + DWORD dwWaitTime; + + dwWaitTime = ServiceStatus.dwWaitHint / 10; + + if( dwWaitTime < 500 ) + dwWaitTime = 500; + else if ( dwWaitTime > 5000 ) + dwWaitTime = 5000; + /* increment the progress bar */ SendMessage(hProgBar, PBM_STEPIT, 0, 0); @@ -91,7 +100,22 @@ GetError(0); return FALSE; } - Loop--; + + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* The service is making progress. increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) + { + /* No progress made within the wait hint */ + break; + } + } } CloseServiceHandle(hSc);

1 0

[turner] 20994: Added some error checking after allocations. Part of bug #1110.
by turner＠svn.reactos.org 22 Jan '06

22 Jan '06

Added some error checking after allocations. Part of bug #1110. Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/kernel32/misc/profile.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2006-01-22 23:28:05 UTC (rev 20993) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2006-01-22 23:29:53 UTC (rev 20994) @@ -197,6 +197,12 @@ } } target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100); + if(target == NULL) + { + HeapFree(GetProcessHeap(),0,from); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } t = target; talloced= 100; @@ -250,16 +256,37 @@ if (NULL!=(x=strchr(f,'!'))) { *x='\0'; fmtstr=HeapAlloc(GetProcessHeap(),0,strlen(f)+2); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } sprintf(fmtstr,"%%%s",f); f=x+1; } else { fmtstr=HeapAlloc(GetProcessHeap(),0,strlen(f)+2); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } sprintf(fmtstr,"%%%s",f); f+=strlen(f); /*at \0*/ } } else { if(!args) break; fmtstr = HeapAlloc(GetProcessHeap(),0,3); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } strcpy( fmtstr, "%s" ); } if (args) { @@ -401,6 +428,11 @@ if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, (strlenW((LPCWSTR)lpSource) + 1) * sizeof(WCHAR) ); + if(from == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } strcpyW( from, (LPCWSTR)lpSource ); } else { @@ -418,6 +450,12 @@ } target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); + if(target == NULL) + { + HeapFree(GetProcessHeap(),0,from); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } t = target; talloced= 100; @@ -472,16 +510,37 @@ if (NULL!=(x=strchrW(f,'!'))) { *x='\0'; fmtstr=HeapAlloc( GetProcessHeap(), 0,(strlenW(f)+2)*sizeof(WCHAR)); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } sprintfW(fmtstr,PCNTFMTWSTR,f); f=x+1; } else { fmtstr=HeapAlloc(GetProcessHeap(),0,(strlenW(f)+2)*sizeof(WCHAR)); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } sprintfW(fmtstr,PCNTFMTWSTR,f); f+=strlenW(f); /*at \0*/ } } else { if(!args) break; fmtstr = HeapAlloc( GetProcessHeap(),0,3*sizeof(WCHAR)); + if(fmtstr == NULL) + { + HeapFree(GetProcessHeap(),0,from); + HeapFree(GetProcessHeap(),0,target); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } strcpyW( fmtstr, FMTWSTR ); } _____ Modified: trunk/reactos/lib/kernel32/misc/profile.c --- trunk/reactos/lib/kernel32/misc/profile.c 2006-01-22 23:28:05 UTC (rev 20993) +++ trunk/reactos/lib/kernel32/misc/profile.c 2006-01-22 23:29:53 UTC (rev 20994) @@ -830,6 +830,11 @@ /* OK, now that CurProfile is definitely free we assign it our new file */ CurProfile->filename = HeapAlloc( GetProcessHeap(), 0, (wcslen(buffer)+1) * sizeof(WCHAR) ); + if(CurProfile->filename == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } wcscpy( CurProfile->filename, buffer ); if (hFile != INVALID_HANDLE_VALUE) @@ -1061,6 +1066,11 @@ DPRINT(" creating key\n"); } key->value = HeapAlloc( GetProcessHeap(), 0, (wcslen(value) + 1) * sizeof(WCHAR) ); + if(key->value == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } wcscpy( key->value, value ); CurProfile->changed = TRUE; } @@ -1126,6 +1136,11 @@ LPWSTR p; p = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if(p == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } memcpy(p, def_val, len * sizeof(WCHAR)); p[len] = '\0'; pDefVal = p; @@ -1482,6 +1497,12 @@ ret = TRUE; while(*string) { LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (wcslen(string)+1) * sizeof(WCHAR) ); + if(buf == NULL) + { + RtlLeaveCriticalSection( &PROFILE_CritSect ); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } wcscpy( buf, string ); if((p = wcschr( buf, '='))) { *p = '\0'; @@ -1759,6 +1780,11 @@ /* allocate string buffer for hex chars + checksum hex char + '\0' */ outstring = HeapAlloc( GetProcessHeap(), 0, (bufsize*2 + 2 + 1) * sizeof(WCHAR) ); + if(outstring == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } p = outstring; for (binbuf = (LPBYTE)buf; binbuf < (LPBYTE)buf+bufsize; binbuf++) {

1 0

[weiden] 20993: validate the ACLs and SIDs after capturing them in SeCaptureSecurityDescriptor()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

validate the ACLs and SIDs after capturing them in SeCaptureSecurityDescriptor() Modified: trunk/reactos/ntoskrnl/se/sd.c _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2006-01-22 23:17:50 UTC (rev 20992) +++ trunk/reactos/ntoskrnl/se/sd.c 2006-01-22 23:28:05 UTC (rev 20993) @@ -372,8 +372,7 @@ PAGED_CODE(); if(CapturedSecurityQualityOfService != NULL && - (AccessMode != KernelMode || - (AccessMode == KernelMode && CaptureIfKernel))) + (AccessMode != KernelMode || CaptureIfKernel)) { ExFreePool(CapturedSecurityQualityOfService); } @@ -551,10 +550,6 @@ ProbeForRead(SidType, \ SidType##Size, \ sizeof(ULONG)); \ - if(!RtlValidSid(SidType)) \ - { \ - Status = STATUS_INVALID_SID; \ - } \ } \ _SEH_HANDLE \ { \ @@ -600,10 +595,6 @@ ProbeForRead(AclType, \ AclType##Size, \ sizeof(ULONG)); \ - if(!RtlValidAcl(AclType)) \ - { \ - Status = STATUS_INVALID_ACL; \ - } \ } \ _SEH_HANDLE \ { \ @@ -648,8 +639,10 @@ { /* setup the offsets and copy the SIDs and ACLs to the new self-relative security descriptor. Probing the pointers is not - neccessary anymore as we did that when collecting the sizes! */ -#define CopySIDOrACL(Type) \ + neccessary anymore as we did that when collecting the sizes! + Make sure to validate the SIDs and ACLs *again* as they could have + been modified in the meanwhile! */ +#define CopySID(Type) \ do { \ if(DescriptorCopy.Type != NULL) \ { \ @@ -658,14 +651,38 @@ (ULONG_PTR)NewDescriptor->Type), \ DescriptorCopy.Type, \ Type##Size); \ + if (!RtlValidSid((PSID)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type))) \ + { \ + RtlRaiseStatus(STATUS_INVALID_SID); \ + } \ Offset += ROUND_UP(Type##Size, sizeof(ULONG)); \ } \ } while(0) - CopySIDOrACL(Owner); - CopySIDOrACL(Group); - CopySIDOrACL(Sacl); - CopySIDOrACL(Dacl); + CopySID(Owner); + CopySID(Group); + +#define CopyACL(Type) \ + do { \ + if(DescriptorCopy.Type != NULL) \ + { \ + NewDescriptor->Type = (PVOID)Offset; \ + RtlCopyMemory((PVOID)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type), \ + DescriptorCopy.Type, \ + Type##Size); \ + if (!RtlValidAcl((PACL)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type))) \ + { \ + RtlRaiseStatus(STATUS_INVALID_ACL); \ + } \ + Offset += ROUND_UP(Type##Size, sizeof(ULONG)); \ + } \ + } while(0) + + CopyACL(Sacl); + CopyACL(Dacl); } _SEH_HANDLE {

1 0

[cwittich] 20992: set TBSTYLE_FLAT
by cwittich＠svn.reactos.org 22 Jan '06

22 Jan '06

set TBSTYLE_FLAT fixed ToolBar size fixed Rebar (does not work on ROS yet) Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-22 23:16:30 UTC (rev 20991) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-22 23:17:50 UTC (rev 20992) @@ -176,9 +176,9 @@ _htoolbar = CreateToolbarEx(hwnd, #ifndef _NO_REBAR - CCS_NOPARENTALIGN|CCS_NORESIZE| + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| #endif - WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, g_Globals._hInstance, IDB_TOOLBAR, + WS_CHILD|TBSTYLE_FLAT|WS_VISIBLE, IDW_TOOLBAR, 2, g_Globals._hInstance, IDB_TOOLBAR, toolbarBtns, sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON)); @@ -222,8 +222,8 @@ #ifndef _NO_REBAR _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| - RBS_VARHEIGHT|RBS_AUTOSIZE|RBS_DBLCLKTOGGLE| - CCS_NODIVIDER|CCS_NOPARENTALIGN, + RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| + WS_BORDER|RBS_AUTOSIZE|RBS_BANDBORDERS, 0, 0, 0, 0, _hwnd, 0, g_Globals._hInstance, 0); int btn_hgt = HIWORD(SendMessage(_htoolbar, TB_GETBUTTONSIZE, 0, 0)); @@ -246,7 +246,7 @@ rbBand.lpText = NULL;//TEXT("Toolbar"); rbBand.hwndChild = _htoolbar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -283,8 +283,12 @@ return true; case WM_SHOWWINDOW: - if (wparam) // trigger child resizing after window creation - now we can succesfully call IsWindowVisible() + if (wparam) // trigger child resizing after window creation - now we can succesfully call IsWindowVisible() + { + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); resize_frame_client(); + } return false; // goto def; case WM_CLOSE: @@ -295,10 +299,13 @@ case WM_DESTROY: break; - case WM_SIZE: - resize_frame(LOWORD(lparam), HIWORD(lparam)); - break; // do not pass message to DefFrameProc + case WM_SIZE:{ + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); + //resize_frame(LOWORD(lparam), HIWORD(lparam)); + break;} // do not pass message to DefFrameProc + case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam; @@ -467,7 +474,8 @@ { switch(pnmh->code) { // resize children windows when the rebar size changes - case RBN_AUTOSIZE: + + case RBN_AUTOSIZE: resize_frame_client(); break; @@ -525,9 +533,9 @@ RECT rect = {0, 0, cx, cy}; if (_hwndrebar) { - int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -730,13 +738,13 @@ #ifndef _NO_REBAR _hextrabar = CreateToolbarEx(hwnd, - CCS_NOPARENTALIGN|CCS_NORESIZE| - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| + WS_CHILD|TBSTYLE_FLAT|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, IDW_EXTRABAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, NULL, 0, - 16, 13, 16, 13, sizeof(TBBUTTON)); + 16, 15, 16, 15, sizeof(TBBUTTON)); #else _hextrabar = CreateToolbarEx(hwnd, - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST,CCS_NODIVIDER| IDW_EXTRABAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &extraBtns, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); #endif @@ -799,13 +807,13 @@ #ifndef _NO_REBAR _hdrivebar = CreateToolbarEx(hwnd, - CCS_NOPARENTALIGN|CCS_NORESIZE| - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| + WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT|CCS_NOMOVEY|TBSTYLE_LIST, IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, NULL, 0, - 16, 13, 16, 13, sizeof(TBBUTTON)); + 16, 15, 16, 15, sizeof(TBBUTTON)); #else _hdrivebar = CreateToolbarEx(hwnd, - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST|CCS_NODIVIDER, IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &drivebarBtn, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); #endif @@ -856,7 +864,7 @@ rbBand.lpText = TEXT("Extras"); rbBand.hwndChild = _hextrabar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); @@ -865,7 +873,7 @@ rbBand.lpText = TEXT("Drives"); rbBand.hwndChild = _hdrivebar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 400; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -1205,9 +1213,9 @@ RECT rect = {0, 0, cx, cy}; if (_hwndrebar) { - int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -1566,8 +1574,8 @@ if (_hwndrebar) { int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0);

1 0

[gvg] 20991: Serendipity blog software import
by gvg＠svn.reactos.org 22 Jan '06

22 Jan '06

Serendipity blog software import Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php Added: trunk/web/reactos.org/htdocs/serendipity/ Added: trunk/web/reactos.org/htdocs/serendipity/.htaccess Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php Added: trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/entries.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bg.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bgcolor.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bgwide.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick footer.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick header.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick logo.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick portrait.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/back.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/down.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/forward.pn g Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/up.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/info.txt Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_de.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_en.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_ko.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/preview.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/sidebar.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/style.css Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/style.css.orig Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/trackbacks.tpl _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -35,15 +35,19 @@ require_once("subsys_bugzilla.php"); require_once("subsys_phpbb.php"); require_once("subsys_wiki.php"); +require_once("subsys_blogs.php"); ?> <div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Check Subsystem Consistency</span> <?php $inconsistency_count = 0; +/* $inconsistency_count += subsys_bugzilla_check(); $inconsistency_count += subsys_phpbb_check(); $inconsistency_count += subsys_wiki_check(); +*/ +$inconsistency_count += subsys_blogs_check(); ?> <h2>Total</h2> <?php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -1,23 +1,5 @@ <?php - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - // To prevent hacking activity: if ( !defined('ROSCMS_SYSTEM') OR !defined('ROSCMS_SYSTEM_ADMIN') ) { @@ -35,6 +17,7 @@ require_once("subsys_bugzilla.php"); require_once("subsys_phpbb.php"); require_once("subsys_wiki.php"); +require_once("subsys_blogs.php"); ?> @@ -61,6 +44,10 @@ { $fix_count += subsys_wiki_fix_all(); } +if ($subsys == 'blogs' || $subsys == 'all') + { + $fix_count += subsys_blogs_fix_all(); + } ?> <h2>Total</h2> <?php _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,402 @@ +<?php + +// To prevent hacking activity: +if ( !defined('ROSCMS_SYSTEM')) +{ + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="subsys_blogs"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: subsys_blogs.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); +} + +require_once("subsys_utils.php"); + +define('SUBSYS_BLOGS_DBNAME', "blogs"); + +function subsys_blogs_info_check() +{ + $inconsistency_count = 0; + $query = "SELECT u.user_id, u.user_name, u.user_fullname, u.user_email, " . + " b.username, b.realname, b.email " . + " FROM users u, " . + " subsys_mappings m, " . + SUBSYS_BLOGS_DBNAME . ".ser_authors b " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs' " . + " AND b.authorid = m.map_subsys_userid " . + " AND (u.user_name != b.username OR " . + " u.user_fullname != b.realname OR " . + " u.user_email != b.email) "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #1)"); + while ($result_row = mysql_fetch_array($query_set)) + { + echo "Info mismatch for RosCMS userid " . $result_row['user_id'] . ": "; + if ($result_row['user_name'] <> $result_row['username']) + { + echo "user_login " . $result_row['user_name'] . "/" . + $result_row['username'] . " "; + } + if ($result_row['user_email'] <> $result_row['email']) + { + echo "user_email " . $result_row['user_email'] . "/" . + $result_row['email']; + } + if ($result_row['user_fullname'] <> $result_row['realname']) + { + echo "user_fullname " . $result_row['user_fullname'] . "/" . + $result_row['realname']; + } + echo "<br>\n"; + $inconsistency_count++; + } + + return $inconsistency_count; +} + +function subsys_blogs_mapping_check() +{ + $inconsistency_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = u.user_id " . + " AND u.user_id NOT IN " . + " (SELECT m.map_roscms_userid " . + " FROM subsys_mappings m " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs') "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #4)"); + while ($result_row = mysql_fetch_array($query_set)) + { + echo "No mapping of RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $inconsistency_count++; + } + + return $inconsistency_count; +} + + +function subsys_blogs_check() +{ +?> +<h2>Blogs</h2> +<?php + $inconsistency_count = 0; + $inconsistency_count += subsys_blogs_mapping_check(); + $inconsistency_count += subsys_userids_exist('blogs', + SUBSYS_BLOGS_DBNAME . + '.ser_authors', + 'authorid'); + $inconsistency_count += subsys_blogs_info_check(); + + $fix_url = htmlentities('?page=admin&sec=subsys&sec2=fix&subsys=blogs'); + if (0 == $inconsistency_count) + { + echo "No problems found.<br/>\n"; + } + else if (1 == $inconsistency_count) + { + echo '<br />1 problem found. <a href="' . $fix_url . + '">Fix this</a><br/>' . "\n"; + } + else + { + echo "<br />$inconsistency_count problems found." . + ' <a href="' . $fix_url . '">Fix these</a><br/>' . "\n"; + } + + return $inconsistency_count; +} + +function subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id) +{ + /* Make sure that the email address and/or user name are not already in + use in blogs */ + $query = "SELECT COUNT(*) AS inuse " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE (LOWER(username) = LOWER('" . + mysql_real_escape_string($roscms_user_name) . "') OR " . + " LOWER(email) = LOWER('" . + mysql_real_escape_string($roscms_user_email) . "')) " . + " AND authorid <> $blogs_user_id "; + $blogs_check_set = mysql_query($query) + or die("DB error (subsys_blogs #7)"); + $blogs_check_row = mysql_fetch_array($blogs_check_set); + if (0 != $blogs_check_row['inuse']) + { + echo "User name ($roscms_user_name) and/or email address " . + "($roscms_user_email) collision<br>\n"; + return FALSE; + } + + /* Now, make sure that info in blogs matches info in roscms */ + $query = "UPDATE " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " SET realname = '" . + mysql_real_escape_string($roscms_user_fullname) . "', " . + " username = '" . + mysql_real_escape_string($roscms_user_name) . "', " . + " email = '" . + mysql_real_escape_string($roscms_user_email) . "' " . + " WHERE authorid = $blogs_user_id"; + mysql_query($query) or die("DB error (subsys_blogs #8)"); + + return TRUE; +} + +function subsys_blogs_add_blogs_user($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email) +{ + $query = "INSERT INTO " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " (realname, username, email) " . + "VALUES (" . + " '" . mysql_real_escape_string($roscms_user_fullname) . "', " . + " '" . mysql_real_escape_string($roscms_user_name) . "', " . + " '" . mysql_real_escape_string($roscms_user_email) . "') "; + mysql_query($query) or die("DB error (subsys_phpbb #17)"); + + /* Add user to Developers group */ + $query = "INSERT INTO " . SUBSYS_BLOGS_DBNAME . ".ser_authorgroups " . + " (groupid, authorid) " . + "SELECT id, LAST_INSERT_ID() " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_groups " . + " WHERE LOWER(name) = 'developer' "; + mysql_query($query) or die("DB error (subsys_phpbb #18)"); + + /* Finally, insert a row in the mapping table */ + $query = "INSERT INTO subsys_mappings " . + " (map_roscms_userid, map_subsys_name, map_subsys_userid) " . + " VALUES($roscms_user_id, 'blogs', LAST_INSERT_ID())"; + mysql_query($query) or die("DB error (subsys_phpbb #11)"); + + return TRUE; +} + +function subsys_blogs_add_mapping($roscms_user_id) +{ + if (! subsys_get_roscms_info($roscms_user_id, + $roscms_user_name, + $roscms_user_email, + $roscms_user_fullname, + $roscms_user_password, + $roscms_user_register)) + { + return FALSE; + } + + /* First, try to match on email address */ + $query = "SELECT authorid " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE LOWER(email) = LOWER('" . + mysql_real_escape_string($roscms_user_email) . "')"; + $blogs_email_set = mysql_query($query) + or die("DB error (subsys_blogs #5)"); + if ($blogs_email_row = mysql_fetch_array($blogs_email_set)) + { + $blogs_user_id = $blogs_email_row['authorid']; + } + else + { + /* That failed. Let's try to match on user name then */ + $query = "SELECT authorid " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE LOWER(username) = LOWER('" . + mysql_real_escape_string($roscms_user_name) . "')"; + $blogs_name_set = mysql_query($query) + or die("DB error (subsys_blogs #6)"); + if ($blogs_name_row = mysql_fetch_array($blogs_name_set)) + { + $blogs_user_id = $blogs_name_row['authorid']; + } + } + + if (! isset($blogs_user_id)) + { + /* We haven't found a match, so we need to add a new blogs user */ + $fixed = subsys_blogs_add_blogs_user($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email); + } + else + { + /* Synchronize the info in blogs */ + if (! subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id)) + { + return FALSE; + } + + /* Insert a row in the mapping table */ + $query = "INSERT INTO subsys_mappings " . + " (map_roscms_userid, map_subsys_name, map_subsys_userid) " . + " VALUES($roscms_user_id, 'blogs', $blogs_user_id)"; + mysql_query($query) or die("DB error (subsys_blogs #9)"); + + $fixed = TRUE; + } + + return $fixed; +} + +function subsys_blogs_update_existing($roscms_user_id, $blogs_user_id) +{ + if (! subsys_get_roscms_info($roscms_user_id, + $roscms_user_name, + $roscms_user_email, + $roscms_user_fullname, + $roscms_user_password, + $roscms_user_register)) + { + return FALSE; + } + + if (! subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id)) + { + return FALSE; + } + + return TRUE; +} + +function subsys_blogs_update_user($roscms_user_id) +{ + $query = "SELECT map_subsys_userid " . + " FROM subsys_mappings " . + " WHERE map_roscms_userid = $roscms_user_id " . + " AND map_subsys_name = 'blogs'"; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #2)"); + if ($result_row = mysql_fetch_array($query_set)) + { + $fixed = subsys_blogs_update_existing($roscms_user_id, + $result_row['map_subsys_userid']); + } + else + { + $query = "SELECT COUNT(*) AS count " . + " FROM usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = $roscms_user_id "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #14)"); + if (($result_row = mysql_fetch_array($query_set)) && + 0 != $result_row['count']) + { + $fixed = subsys_blogs_add_mapping($roscms_user_id); + } + else + { + $fixed = 0; + } + } + + return $fixed; +} + +function subsys_blogs_fix_mappings() +{ + $fix_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = u.user_id " . + " AND u.user_id NOT IN " . + " (SELECT m.map_roscms_userid " . + " FROM subsys_mappings m " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs') "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #3)"); + while ($result_row = mysql_fetch_array($query_set)) + { + if (subsys_blogs_update_user($result_row['user_id'])) + { + echo "Fixed mapping of RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $fix_count++; + } + else + { + echo "Unable to fix mapping of RosCMS userid " . + $result_row['user_id'] . "<br>\n"; + } + } + + return $fix_count; +} + +function subsys_blogs_fix_info() +{ + $fix_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " subsys_mappings m, " . + SUBSYS_BLOGS_DBNAME . ".ser_authors b " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs' " . + " AND b.authorid = m.map_subsys_userid " . + " AND (u.user_name != b.username OR " . + " u.user_fullname != b.realname OR " . + " u.user_email != b.email) "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #12)".$query); + while ($result_row = mysql_fetch_array($query_set)) + { + if (subsys_blogs_update_user($result_row['user_id'])) + { + echo "Fixed info for RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $fix_count++; + } + else + { + echo "Unable to fix info for RosCMS userid " . + $result_row['user_id'] . "<br>\n"; + } + } + + return $fix_count; +} + +function subsys_blogs_fix_all() +{ +?> +<h2>Blogs</h2> +<?php + $fix_count = 0; + $fix_count += subsys_blogs_fix_mappings(); + $fix_count += subsys_blogs_fix_info(); + if (0 == $fix_count) + { + echo "No problems fixed.<br/>\n"; + } + else if (1 == $fix_count) + { + echo "<br>1 problem fixed.<br/>\n"; + } + else + { + echo "<br>$fix_count problems fixed.<br/>\n"; + } + + return $fix_count; +} + +?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -76,23 +76,23 @@ if ($subsys == "roscms" || $subsys == "") { $query = "SELECT u.user_id, s.usersession_expires " . - " FROM user_sessions s, " . - " users u " . + " FROM roscms.user_sessions s, " . + " roscms.users u " . $bulk_of_where; } else { $query = "SELECT m.map_subsys_userid, s.usersession_expires " . - " FROM user_sessions s, " . - " users u, " . - " subsys_mappings m " . + " FROM roscms.user_sessions s, " . + " roscms.users u, " . + " roscms.subsys_mappings m " . $bulk_of_where . " AND m.map_roscms_userid = s.usersession_user_id " . " AND m.map_subsys_name = '" . mysql_escape_string($subsys) . "'"; } $statement = mysql_query($query, $connect) - or die('DB error (user login)'); + or die('DB error (user login) ' . $query); if ($row = mysql_fetch_array($statement)) { @@ -103,7 +103,7 @@ { /* Session with timeout. Update the expiry time in the table and the expiry time of the cookie */ - $query = "UPDATE user_sessions " . + $query = "UPDATE roscms.user_sessions " . " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . " WHERE usersession_id = '" . mysql_escape_string($session_id_clean) . "'"; _____ Copied: trunk/web/reactos.org/htdocs/serendipity (from rev 20990, vendor/serendipity/current) _____ Added: trunk/web/reactos.org/htdocs/serendipity/.htaccess --- vendor/serendipity/current/.htaccess 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/.htaccess 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,26 @@ +# BEGIN s9y +DirectoryIndex /serendipity/index.php +php_value session.use_trans_sid 0 +php_value register_globals off + +<Files *.tpl.php> + deny from all +</Files> + +<Files *.tpl> + deny from all +</Files> + +<Files *.sql> + deny from all +</Files> + +<Files *.inc.php> + deny from all +</Files> + +<Files *.db> + deny from all +</Files> + +# END s9y _____ Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php --- vendor/serendipity/current/include/functions_comments.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php 2006-01-22 23:16:30 UTC (rev 20991) @@ -309,9 +309,28 @@ return true; } +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); +@define('ROSCMSLOGIN_NOT_LOGGEDIN', 'You need to be logged in to leave a comment'); + + function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL', $source = 'internal') { global $serendipity; + $roscmsid = roscms_subsys_login('roscms', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 == $roscmsid) { + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = ROSCMSLOGIN_NOT_LOGGEDIN; + return false; + } + $query = "SELECT user_fullname, user_email " . + " FROM roscms.users " . + " WHERE user_id = " . (int) $roscmsid; + $userinfo = serendipity_db_query($query, true); + if (is_array($userinfo)) { + $commentInfo['name'] = $userinfo['user_fullname']; + $commentInfo['email'] = $userinfo['user_email']; + } + $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp, title FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'"; $ca = serendipity_db_query($query, true); _____ Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p --- vendor/serendipity/current/include/functions_config.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p 2006-01-22 23:16:30 UTC (rev 20991) @@ -273,49 +273,44 @@ unset($serendipity['COOKIE'][$name]); } +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); + function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false, $use_external = true) { global $serendipity; - if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) { - $username = $_SESSION['serendipityUser']; - $password = $_SESSION['serendipityPassword']; - // For safety reasons when multiple blogs are installed on the same host, we need to check the current author each time to not let him log into a different blog with the same sessiondata - $is_md5 = true; + $authorid = roscms_subsys_login('blogs', + $use_external ? ROSCMS_LOGIN_REQUIRED : + ROSCMS_LOGIN_OPTIONAL, + $serendipity['serendipityHTTPPath'] . + ($serendipity['rewrite'] == 'none' ? + $serendipity['indexFile'] .'?/' : '') . + PATH_ADMIN); + if (0 == $authorid) { + $_SESSION['serendipityAuthedUser'] = false; + return false; } + $query = "SELECT DISTINCT + email, authorid, userlevel, right_publish + FROM + {$serendipity['dbPrefix']}authors + WHERE + authorid = $authorid"; + $row = serendipity_db_query($query, true, 'assoc'); - if ($username != '') { - if ($use_external) { - serendipity_plugin_api::hook_event('backend_auth', $is_md5, array('username' => $username, 'password' => $password)); - } - - if ($is_md5 === false && !empty($password)) { - $password = md5($password); - } - - $query = "SELECT DISTINCT - email, authorid, userlevel, right_publish - FROM - {$serendipity['dbPrefix']}authors - WHERE - username = '" . serendipity_db_escape_string($username) . "' - AND password = '" . serendipity_db_escape_string($password) . "'"; - $row = serendipity_db_query($query, true, 'assoc'); - - if (is_array($row)) { - serendipity_setCookie('old_session', session_id()); - $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; - $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; - $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; - $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; - $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; - $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; - $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; - serendipity_load_configuration($serendipity['authorid']); - return true; - } else { - $_SESSION['serendipityAuthedUser'] = false; - @session_destroy(); - } + if (is_array($row)) { + serendipity_setCookie('old_session', session_id()); + $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $row['username']; + $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = ''; + $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; + $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; + $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; + $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; + $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; + serendipity_load_configuration($serendipity['authorid']); + return true; + } else { + $_SESSION['serendipityAuthedUser'] = false; + @session_destroy(); } return false; _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/lang _de.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,4 @@ +<?php # $Id: lang_de.inc.php,v 1.1 2005/08/01 15:45:48 garvinhicking Exp $ + + @define('PLUGIN_AUTHORS_NAME', 'Liste der Autoren'); + @define('PLUGIN_AUTHORS_DESC', 'Zeigt Eintrõge nach Autor.'); _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/lang _pt.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,4 @@ +<?php + + @define('PLUGIN_AUTHORS_NAME', 'Autores'); + @define('PLUGIN_AUTHORS_DESC', 'Mostra entradas por autor.'); _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/sere ndipity_plugin_activeauthors.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,89 @@ +<?php # Based on serendipity_plugin_authors.php + +// Probe for a language include with constants. Still include defines later on, if some constants were missing +$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} + +@define('PLUGIN_ACTIVEAUTHORS_NAME', 'Active Authors'); +@define('PLUGIN_ACTIVEAUTHORS_DESC', 'Displays active authors.'); +@define('PLUGIN_ACTIVEAUTHORS_TITLE', 'Authors'); +@define('PLUGIN_ACTIVEAUTHORS_ALL', 'All'); + +class serendipity_plugin_activeauthors extends serendipity_plugin +{ + var $title = PLUGIN_ACTIVEAUTHORS_TITLE; + + function introspect(&$propbag) + { + $propbag->add('name', PLUGIN_ACTIVEAUTHORS_NAME); + $propbag->add('description', PLUGIN_ACTIVEAUTHORS_DESC); + $propbag->add('stackable', true); + $propbag->add('author', 'Ge van Geldorp/Victor Fusco'); + $propbag->add('version', '1.0'); + $propbag->add('requirements', array( + 'serendipity' => '0.8', + 'smarty' => '2.6.7', + 'php' => '4.1.0' + )); + $propbag->add('groups', array('FRONTEND_VIEWS')); + $propbag->add('configuration', array('title')); + } + + function introspect_config_item($name, &$propbag) + { + switch($name) { + case 'title': + $propbag->add('type', 'string'); + $propbag->add('name', TITLE); + $propbag->add('description', TITLE); + $propbag->add('default', PLUGIN_ACTIVEAUTHORS_TITLE); + break; + } + return true; + } + + function generate_content(&$title) { + global $serendipity; + + $title = $this->get_config('title', $this->title); + + $alllink = $serendipity['serendipityHTTPPath']; + echo '<a href="' . $alllink . '">' . PLUGIN_ACTIVEAUTHORS_ALL . "</a><br />\n"; + + + $authors_query = "SELECT DISTINCT a.realname, a.username, a.authorid " . + " FROM {$serendipity['dbPrefix']}authors a, " . + " {$serendipity['dbPrefix']}entries e " . + " WHERE e.authorid = a.authorid " . + " AND e.isdraft = 'false' " . + " ORDER BY a.realname "; + $row_authors = serendipity_db_query($authors_query); + + if (isset($row_authors) && is_array($row_authors)) { + foreach ($row_authors as $entry) { + if (function_exists('serendipity_authorURL')) { + $entryLink = serendipity_authorURL($entry); + } else { + $entryLink = serendipity_rewriteURL( + PATH_AUTHORS . '/' . + serendipity_makePermalink( + PERM_AUTHORS, + array( + 'id' => $entry['authorid'], + 'title' => $entry['realname'] + ) + ) + ); + } + + echo '<a href="' . $entryLink . '">' . $entry['realname'] . + "</a><br />\n"; + } + } + } +} + +/* vim: set sts=4 ts=4 expandtab : */ +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php --- vendor/serendipity/current/plugins/serendipity_plugin_roscmsaccount/sere ndipity_plugin_roscmsaccount.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,73 @@ +<?php + +// Probe for a language include with constants. Still include defines later on, if some constants were missing +$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} + +@define('PLUGIN_ROSCMSACCOUNT_TITLE', 'Account'); +@define('PLUGIN_ROSCMSACCOUNT_NAME', 'Roscms-account'); +@define('PLUGIN_ROSCMSACCOUNT_DESC', 'Roscms global login system account management'); +@define('PLUGIN_ROSCMSACCOUNT_LOGIN', 'Login'); +@define('PLUGIN_ROSCMSACCOUNT_LOGOUT', 'Logout'); +@define('PLUGIN_ROSCMSACCOUNT_REGISTER', 'Register'); +@define('PLUGIN_ROSCMSACCOUNT_MANAGE', 'Manage blog entries'); + +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); + +class serendipity_plugin_roscmsaccount extends serendipity_plugin +{ + function introspect(&$propbag) + { + $propbag->add('name', PLUGIN_ROSCMSACCOUNT_NAME); + $propbag->add('description', PLUGIN_ROSCMSACCOUNT_DESC); + $propbag->add('stackable', true); + $propbag->add('author', 'Ge van Geldorp'); + $propbag->add('version', '1.0'); + $propbag->add('groups', array('FRONTEND_FEATURES')); + } + + function generate_content(&$title) + { + global $serendipity; + + $title = PLUGIN_ROSCMSACCOUNT_TITLE; + $roscmsid = roscms_subsys_login('roscms', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 == $roscmsid) { + echo '<a href="/roscms/?page=login&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_LOGIN . "</a><br />\n"; + } else { + echo '<a href="/roscms/?page=logout&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_LOGOUT; + $who_query = "SELECT user_name " . + " FROM roscms.users " . + " WHERE user_id = $roscmsid "; + $row_who = serendipity_db_query($who_query, true); + + if (is_array($row_who)) { + echo ' [' . $row_who['user_name'] . ']'; + } + echo "</a><br />\n"; + } + echo '<a href="/roscms/?page=register&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_REGISTER . "</a><br />\n"; + $authorid = roscms_subsys_login('blogs', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 != $authorid) { + $base = $serendipity['serendipityHTTPPath']; + + $link = $serendipity['serendipityHTTPPath'] . + ($serendipity['rewrite'] == 'none' ? + $serendipity['indexFile'] .'?/' : '') . PATH_ADMIN; + $text = PLUGIN_ROSCMSACCOUNT_MANAGE; + echo '<a href="' . $link . '" title="'. $text .'">'. $text . + "</a><br />\n"; + } + } +} + +/* vim: set sts=4 ts=4 expandtab : */ +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p --- vendor/serendipity/current/serendipity_config_local.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,17 @@ +<?php + /* + Serendipity configuration file + Written on Tue, 17 Jan 2006 22:13:03 +0100 + */ + + $serendipity['versionInstalled'] = '0.9.1'; + $serendipity['dbPrefix'] = 'ser_'; + $serendipity['dbType'] = 'mysql'; + $serendipity['dbPersistent'] = true; + + // End of Serendipity configuration file + // You can place your own special variables after here: + + require_once("blogs-connect.php"); + @define('ROSCMS_INC_PATH', '/web/reactos.org/htdocs/roscms/inc'); +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l --- vendor/serendipity/current/templates/roscms/commentform.tpl 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,43 @@ +<div class="serendipityCommentForm"> + <a id="serendipity_CommentForm"></a> + <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post"> + <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}" /></div> + <table border="0" width="100%" cellpadding="3"> + <tr> + <td class="serendipity_commentsLabel"><label for="serendipity_replyTo">{$CONST.IN_REPLY_TO}</label></td> + <td class="serendipity_commentsValue">{$commentform_replyTo}</td> + </tr> + + <tr> + <td class="serendipity_commentsLabel"><label for="serendipity_commentform_comment">{$CONST.COMMENT}</label></td> + <td class="serendipity_commentsValue"> + <textarea rows="10" cols="40" id="serendipity_commentform_comment" name="serendipity[comment]">{$commentform_data}</textarea><br /> + {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} + </td> + </tr> + +{if $is_commentform_showToolbar} + <tr> + <td> </td> + <td class="serendipity_commentsLabel"> + {if $is_allowSubscriptions} + <br /> + <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /><label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> + {/if} + </td> + </tr> +{/if} + +{if $is_moderate_comments} + <tr> + <td class="serendipity_commentsValue serendipity_msg_important" colspan="2">{$CONST.COMMENTS_WILL_BE_MODERATED}</td> + </tr> +{/if} + + <tr> + <td> </td> + <td><input type="submit" name="serendipity[submit]" value="{$CONST.SUBMIT_COMMENT}" /> <input type="submit" name="serendipity[preview]" value="{$CONST.PREVIEW}" /></td> + </tr> + </table> + </form> +</div> _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl --- vendor/serendipity/current/templates/roscms/comments.tpl 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,24 @@ +{foreach from=$comments item=comment name="comments"} + <a id="c{$comment.id}"></a> + <li class="{if $smarty.foreach.comments.iteration is odd}graybox{/if}" style="margin-left: {$comment.depth*20}px"> + <cite>{if $comment.url} + <a href="{$comment.url}" target="_blank">{$comment.author|@default:$CONST.ANONYMOUS}</a> + {else} + {$comment.author|@default:$CONST.ANONYMOUS} + {/if}</cite> {$CONST.SAYS}:<br /> + <small class="commentmetadata"> + <a href="#c{$comment.id}" title="{$CONST.LINK_TO_COMMENT|sprintf:$comment.trace}">#{$comment.trace }</a> + {$comment.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT} + {if $entry.is_entry_owner} + (<a href="{$comment.link_delete}" onclick="return confirm('{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.au thor}');">{$CONST.DELETE}</a>) + {/if} + {roscms_can_add_comment} + {if $entry.allow_comments && $can_add_comment eq 'true'} + (<a href="#serendipity_CommentForm" onclick="document.getElementById('serendipity_replyTo').value='{$comment .id}';">{$CONST.REPLY}</a>) + {/if} + </small> + <p>{$comment.body}</p> + </li> +{foreachelse} + <p class="nocomments">{$CONST.NO_COMMENTS}</p> +{/foreach} _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php --- vendor/serendipity/current/templates/roscms/config.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,42 @@ +<?php # $Id: config.inc.php 108 2005-05-19 08:40:00Z garvinhicking $ + +$probelang = dirname(__FILE__) . '/lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} else { + include dirname(__FILE__) . '/lang_en.inc.php'; +} + +@define('LOGIN_TO_LEAVE_COMMENT', 'Please <a href="/roscms/?page=login&target=%s#comments">login</a> to leave a comment'); + +$serendipity['smarty']->register_function('roscms_sidebar_transform', + 'roscms_smarty_sidebar_transform'); +$serendipity['smarty']->register_function('roscms_can_add_comment', + 'roscms_smarty_can_add_comment'); + +function roscms_smarty_sidebar_transform($params, &$smarty) +{ + $old_content = $params['content']; + + if (empty($old_content)) { + $new_content = ''; + } else { + $new_content = '<li>'; + $new_content .= preg_replace('=<br />\n?=i', "</li>\n<li>", $old_content); + $new_content .= "</li>\n"; + $new_content = preg_replace('=<li></li>=i', '', $new_content); + } + + return $new_content; +} + +function roscms_smarty_can_add_comment($params, &$smarty) [truncated at 1000 lines; 1170 more skipped]

1 0

[gvg] 20990: Tag Serendipity 0.9.1
by gvg＠svn.reactos.org 22 Jan '06

22 Jan '06

Tag Serendipity 0.9.1 Added: vendor/serendipity/0.9.1/ _____ Copied: vendor/serendipity/0.9.1 (from rev 20989, vendor/serendipity/current)

1 0

[gvg] 20989: Serendipity (blog software) vendor drop
by gvg＠svn.reactos.org 22 Jan '06

22 Jan '06

Serendipity (blog software) vendor drop Added: vendor/serendipity/ Added: vendor/serendipity/current/ Added: vendor/serendipity/current/bundled-libs/ Added: vendor/serendipity/current/bundled-libs/.current_version Added: vendor/serendipity/current/bundled-libs/Cache/ Added: vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Cache/Lite/ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php Added: vendor/serendipity/current/bundled-libs/Cache/Lite.php Added: vendor/serendipity/current/bundled-libs/HTTP/ Added: vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/HTTP/Request/ Added: vendor/serendipity/current/bundled-libs/HTTP/Request/Listener.php Added: vendor/serendipity/current/bundled-libs/HTTP/Request.php Added: vendor/serendipity/current/bundled-libs/Net/ Added: vendor/serendipity/current/bundled-libs/Net/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Net/CheckIP.php Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/ Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/SURBL.php Added: vendor/serendipity/current/bundled-libs/Net/DNSBL.php Added: vendor/serendipity/current/bundled-libs/Net/Socket.php Added: vendor/serendipity/current/bundled-libs/Net/URL.php Added: vendor/serendipity/current/bundled-libs/Onyx/ Added: vendor/serendipity/current/bundled-libs/Onyx/RSS.php Added: vendor/serendipity/current/bundled-libs/PEAR.php Added: vendor/serendipity/current/bundled-libs/Smarty/ Added: vendor/serendipity/current/bundled-libs/Smarty/BUGS Added: vendor/serendipity/current/bundled-libs/Smarty/COPYING.lib Added: vendor/serendipity/current/bundled-libs/Smarty/ChangeLog Added: vendor/serendipity/current/bundled-libs/Smarty/FAQ Added: vendor/serendipity/current/bundled-libs/Smarty/INSTALL Added: vendor/serendipity/current/bundled-libs/Smarty/NEWS Added: vendor/serendipity/current/bundled-libs/Smarty/README Added: vendor/serendipity/current/bundled-libs/Smarty/RELEASE_NOTES Added: vendor/serendipity/current/bundled-libs/Smarty/libs/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Config_File.class.ph p Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Smarty.class.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Smarty_Compiler.clas s.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/debug.tpl Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.assem ble_plugin_filepath.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.assig n_smarty_interface.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.creat e_dir_structure.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.displ ay_debug_console.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_i nclude_path.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_m icrotime.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_p hp_resource.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.is_se cure.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.is_tr usted.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.load_ plugins.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.load_ resource_plugin.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.proce ss_cached_inserts.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.proce ss_compiled_include.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.read_ cache_file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.rm_au to.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.rmdir .php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.run_i nsert_handler.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.smart y_include_php.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _cache_file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _compiled_include.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _compiled_resource.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/block.textfo rmat.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/compiler.ass ign.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.ass ign_debug_info.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.con fig_load.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.cou nter.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.cyc le.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.deb ug.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.eva l.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.fet ch.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_checkboxes.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_image.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_options.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_radios.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_select_date.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_select_time.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_table.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.mai lto.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.mat h.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.pop up.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.pop up_init.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cap italize.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cat .php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_characters.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_paragraphs.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_sentences.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_words.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.dat e_format.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.deb ug_print_var.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.def ault.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.esc ape.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.ind ent.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.low er.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.nl2 br.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.reg ex_replace.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.rep lace.php [truncated at 100 lines; 1458 more skipped] _____ Added: vendor/serendipity/current/bundled-libs/.current_version --- vendor/serendipity/current/bundled-libs/.current_version 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/.current_version 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,11 @@ +Cache_Lite 1.5.1 +HTTP_Request 1.2.4 +Net_CheckIP 1.1 +Net_Socket 1.0.6 +Net_URL 1.0.14 +PEAR 1.3.5 +Text_Wiki 0.25.0 +XML_RPC 1.4.0 +Onyx 1.0 (customized) +Smarty 2.6.9 +Net_DNSBL 1.0.0 \ No newline at end of file _____ Added: vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE --- vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,8 @@ +- Replace: +Lite.php: +include_once('PEAR.php'); +include_once dirname(__FILE__) . '/../PEAR.php'; + +Output.php, Function.php: +require_once('Cache/Lite.php'); +require_once(dirname(__FILE__) . '/../Lite.php'; \ No newline at end of file _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php --- vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,111 @@ +<?php + +/** +* This class extends Cache_Lite and can be used to cache the result and output of functions/methods +* +* This class is completly inspired from Sebastian Bergmann's +* PEAR/Cache_Function class. This is only an adaptation to +* Cache_Lite +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* @package Cache_Lite +* @version $Id: Function.php,v 1.6 2004/02/03 17:07:13 fab Exp $ +* @author Sebastian BERGMANN <sb(a)sebastian-bergmann.de> +* @author Fabien MARTY <fab(a)php.net> +*/ + +require_once(dirname(__FILE__) . '/../Lite.php'); + +class Cache_Lite_Function extends Cache_Lite +{ + + // --- Private properties --- + + /** + * Default cache group for function caching + * + * @var string $_defaultGroup + */ + var $_defaultGroup = 'Cache_Lite_Function'; + + // --- Public methods ---- + + /** + * Constructor + * + * $options is an assoc. To have a look at availables options, + * see the constructor of the Cache_Lite class in 'Cache_Lite.php' + * + * Comparing to Cache_Lite constructor, there is another option : + * $options = array( + * (...) see Cache_Lite constructor + * 'defaultGroup' => default cache group for function caching (string) + * ); + * + * @param array $options options + * @access public + */ + function Cache_Lite_Function($options = array(NULL)) + { + if (isset($options['defaultGroup'])) { + $this->_defaultGroup = $options['defaultGroup']; + } + $this->Cache_Lite($options); + } + + /** + * Calls a cacheable function or method (or not if there is already a cache for it) + * + * Arguments of this method are read with func_get_args. So it doesn't appear + * in the function definition. Synopsis : + * call('functionName', $arg1, $arg2, ...) + * (arg1, arg2... are arguments of 'functionName') + * + * @return mixed result of the function/method + * @access public + */ + function call() + { + $arguments = func_get_args(); + $id = serialize($arguments); // Generate a cache id + if (!$this->_fileNameProtection) { + $id = md5($id); + // if fileNameProtection is set to false, then the id has to be hashed + // because it's a very bad file name in most cases + } + $data = $this->get($id, $this->_defaultGroup); + if ($data !== false) { + $array = unserialize($data); + $output = $array['output']; + $result = $array['result']; + } else { + ob_start(); + ob_implicit_flush(false); + $target = array_shift($arguments); + if (strstr($target, '::')) { // classname::staticMethod + list($class, $method) = explode('::', $target); + $result = call_user_func_array(array($class, $method), $arguments); + } else if (strstr($target, '->')) { // object->method + // use a stupid name ($objet_123456789 because) of problems when the object + // name is the same as this var name + list($object_123456789, $method) = explode('->', $target); + global $$object_123456789; + $result = call_user_func_array(array($$object_123456789, $method), $arguments); + } else { // function + $result = call_user_func_array($target, $arguments); + } + $output = ob_get_contents(); + ob_end_clean(); + $array['output'] = $output; + $array['result'] = $result; + $this->save(serialize($array), $id, $this->_defaultGroup); + } + echo($output); + return $result; + } + +} + +?> _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php --- vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,73 @@ +<?php + +/** +* This class extends Cache_Lite and uses output buffering to get the data to cache. +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* @package Cache_Lite +* @version $Id: Output.php,v 1.3 2005/04/17 21:40:18 fab Exp $ +* @author Fabien MARTY <fab(a)php.net> +*/ + +require_once(dirname(__FILE__) . '/../Lite.php'); + +class Cache_Lite_Output extends Cache_Lite +{ + + // --- Public methods --- + + /** + * Constructor + * + * $options is an assoc. To have a look at availables options, + * see the constructor of the Cache_Lite class in 'Cache_Lite.php' + * + * @param array $options options + * @access public + */ + function Cache_Lite_Output($options) + { + $this->Cache_Lite($options); + } + + /** + * Start the cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @return boolean true if the cache is hit (false else) + * @access public + */ + function start($id, $group = 'default', $doNotTestCacheValidity = false) + { + $data = $this->get($id, $group, $doNotTestCacheValidity); + if ($data !== false) { + echo($data); + return true; + } else { + ob_start(); + ob_implicit_flush(false); + return false; + } + } + + /** + * Stop the cache + * + * @access public + */ + function end() + { + $data = ob_get_contents(); + ob_end_clean(); + $this->save($data, $this->_id, $this->_group); + echo($data); + } + +} + + +?> _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite.php --- vendor/serendipity/current/bundled-libs/Cache/Lite.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,755 @@ +<?php + +/** +* Fast, light and safe Cache Class +* +* Cache_Lite is a fast, light and safe cache system. It's optimized +* for file containers. It is fast and safe (because it uses file +* locking and/or anti-corruption tests). +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* Memory Caching is from an original idea of +* Mike BENOIT <ipso(a)snappymail.ca> +* +* Nota : A chinese documentation (thanks to RainX <china_1982(a)163.com>) is +* available at : +* http://rainx.phpmore.com/manual/cache_lite.html +* +* @package Cache_Lite +* @category Caching +* @version $Id: Lite.php,v 1.30 2005/06/13 20:50:48 fab Exp $ +* @author Fabien MARTY <fab(a)php.net> +*/ + +define('CACHE_LITE_ERROR_RETURN', 1); +define('CACHE_LITE_ERROR_DIE', 8); + +class Cache_Lite +{ + + // --- Private properties --- + + /** + * Directory where to put the cache files + * (make sure to add a trailing slash) + * + * @var string $_cacheDir + */ + var $_cacheDir = '/tmp/'; + + /** + * Enable / disable caching + * + * (can be very usefull for the debug of cached scripts) + * + * @var boolean $_caching + */ + var $_caching = true; + + /** + * Cache lifetime (in seconds) + * + * @var int $_lifeTime + */ + var $_lifeTime = 3600; + + /** + * Enable / disable fileLocking + * + * (can avoid cache corruption under bad circumstances) + * + * @var boolean $_fileLocking + */ + var $_fileLocking = true; + + /** + * Timestamp of the last valid cache + * + * @var int $_refreshTime + */ + var $_refreshTime; + + /** + * File name (with path) + * + * @var string $_file + */ + var $_file; + + /** + * File name (without path) + * + * @var string $_fileName + */ + var $_fileName; + + /** + * Enable / disable write control (the cache is read just after writing to detect corrupt entries) + * + * Enable write control will lightly slow the cache writing but not the cache reading + * Write control can detect some corrupt cache files but maybe it's not a perfect control + * + * @var boolean $_writeControl + */ + var $_writeControl = true; + + /** + * Enable / disable read control + * + * If enabled, a control key is embeded in cache file and this key is compared with the one + * calculated after the reading. + * + * @var boolean $_writeControl + */ + var $_readControl = true; + + /** + * Type of read control (only if read control is enabled) + * + * Available values are : + * 'md5' for a md5 hash control (best but slowest) + * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice) + * 'strlen' for a length only test (fastest) + * + * @var boolean $_readControlType + */ + var $_readControlType = 'crc32'; + + /** + * Pear error mode (when raiseError is called) + * + * (see PEAR doc) + * + * @see setToDebug() + * @var int $_pearErrorMode + */ + var $_pearErrorMode = CACHE_LITE_ERROR_RETURN; + + /** + * Current cache id + * + * @var string $_id + */ + var $_id; + + /** + * Current cache group + * + * @var string $_group + */ + var $_group; + + /** + * Enable / Disable "Memory Caching" + * + * NB : There is no lifetime for memory caching ! + * + * @var boolean $_memoryCaching + */ + var $_memoryCaching = false; + + /** + * Enable / Disable "Only Memory Caching" + * (be carefull, memory caching is "beta quality") + * + * @var boolean $_onlyMemoryCaching + */ + var $_onlyMemoryCaching = false; + + /** + * Memory caching array + * + * @var array $_memoryCachingArray + */ + var $_memoryCachingArray = array(); + + /** + * Memory caching counter + * + * @var int $memoryCachingCounter + */ + var $_memoryCachingCounter = 0; + + /** + * Memory caching limit + * + * @var int $memoryCachingLimit + */ + var $_memoryCachingLimit = 1000; + + /** + * File Name protection + * + * if set to true, you can use any cache id or group name + * if set to false, it can be faster but cache ids and group names + * will be used directly in cache file names so be carefull with + * special characters... + * + * @var boolean $fileNameProtection + */ + var $_fileNameProtection = true; + + /** + * Enable / disable automatic serialization + * + * it can be used to save directly datas which aren't strings + * (but it's slower) + * + * @var boolean $_serialize + */ + var $_automaticSerialization = false; + + /** + * Disable / Tune the automatic cleaning process + * + * The automatic cleaning process destroy too old (for the given life time) + * cache files when a new cache file is written. + * 0 => no automatic cache cleaning + * 1 => systematic cache cleaning + * x (integer) > 1 => automatic cleaning randomly 1 times on x cache write + * + * @var int $_automaticCleaning + */ + var $_automaticCleaningFactor = 0; + + /** + * Nested directory level + * + * Set the hashed directory structure level. 0 means "no hashed directory + * structure", 1 means "one level of directory", 2 means "two levels"... + * This option can speed up Cache_Lite only when you have many thousands of + * cache file. Only specific benchs can help you to choose the perfect value + * for you. Maybe, 1 or 2 is a good start. + * + * @var int $_hashedDirectoryLevel + */ + var $_hashedDirectoryLevel = 0; + + /** + * Umask for hashed directory structure + * + * @var int $_hashedDirectoryUmask + */ + var $_hashedDirectoryUmask = 0700; + + // --- Public methods --- + + /** + * Constructor + * + * $options is an assoc. Available options are : + * $options = array( + * 'cacheDir' => directory where to put the cache files (string), + * 'caching' => enable / disable caching (boolean), + * 'lifeTime' => cache lifetime in seconds (int), + * 'fileLocking' => enable / disable fileLocking (boolean), + * 'writeControl' => enable / disable write control (boolean), + * 'readControl' => enable / disable read control (boolean), + * 'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string), + * 'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int), + * 'memoryCaching' => enable / disable memory caching (boolean), + * 'onlyMemoryCaching' => enable / disable only memory caching (boolean), + * 'memoryCachingLimit' => max nbr of records to store into memory caching (int), + * 'fileNameProtection' => enable / disable automatic file name protection (boolean), + * 'automaticSerialization' => enable / disable automatic serialization (boolean) + * 'automaticCleaningFactor' => distable / tune automatic cleaning process (int) + * 'hashedDirectoryLevel' => level of the hashed directory system (int) + * 'hashedDirectoryUmask' => umask for hashed directory structure (int) + * ); + * + * @param array $options options + * @access public + */ + function Cache_Lite($options = array(NULL)) + { + $availableOptions = array('hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode'); + foreach($options as $key => $value) { + if(in_array($key, $availableOptions)) { + $property = '_'.$key; + $this->$property = $value; + } + } + $this->_refreshTime = time() - $this->_lifeTime; + } + + /** + * Test if a cache is available and (if yes) return it + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @return string data of the cache (or false if no cache available) + * @access public + */ + function get($id, $group = 'default', $doNotTestCacheValidity = false) + { + $this->_id = $id; + $this->_group = $group; + $data = false; + if ($this->_caching) { + $this->_setFileName($id, $group); + if ($this->_memoryCaching) { + if (isset($this->_memoryCachingArray[$this->_file])) { + if ($this->_automaticSerialization) { + return unserialize($this->_memoryCachingArray[$this->_file]); + } else { + return $this->_memoryCachingArray[$this->_file]; + } + } else { + if ($this->_onlyMemoryCaching) { + return false; + } + } + } + if ($doNotTestCacheValidity) { + if (file_exists($this->_file)) { + $data = $this->_read(); + } + } else { + if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) { + $data = $this->_read(); + } + } + if (($data) and ($this->_memoryCaching)) { + $this->_memoryCacheAdd($this->_file, $data); + } + if (($this->_automaticSerialization) and (is_string($data))) { + $data = unserialize($data); + } + return $data; + } + return false; + } + + /** + * Save some data in a cache file + * + * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on) + * @param string $id cache id + * @param string $group name of the cache group + * @return boolean true if no problem + * @access public + */ + function save($data, $id = NULL, $group = 'default') + { + if ($this->_caching) { + if ($this->_automaticSerialization) { + $data = serialize($data); + } + if (isset($id)) { + $this->_setFileName($id, $group); + } + if ($this->_memoryCaching) { + $this->_memoryCacheAdd($this->_file, $data); + if ($this->_onlyMemoryCaching) { + return true; + } + } + if ($this->_automaticCleaningFactor>0) { + $rand = rand(1, $this->_automaticCleaningFactor); + if ($rand==1) { + $this->clean(false, 'old'); + } + } + if ($this->_writeControl) { + if (!$this->_writeAndControl($data)) { + @touch($this->_file, time() - 2*abs($this->_lifeTime)); + return false; + } else { + return true; + } + } else { + return $this->_write($data); + } + } + return false; + } + + /** + * Remove a cache file + * + * @param string $id cache id + * @param string $group name of the cache group + * @return boolean true if no problem + * @access public + */ + function remove($id, $group = 'default') + { + $this->_setFileName($id, $group); + if ($this->_memoryCaching) { + if (isset($this->_memoryCachingArray[$this->_file])) { + unset($this->_memoryCachingArray[$this->_file]); + $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1; + } + if ($this->_onlyMemoryCaching) { + return true; + } + } + return $this->_unlink($this->_file); + } + + /** + * Clean the cache + * + * if no group is specified all cache files will be destroyed + * else only cache files of the specified group will be destroyed + * + * @param string $group name of the cache group + * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup', + * 'callback_myFunction' + * @return boolean true if no problem + * @access public + */ + function clean($group = false, $mode = 'ingroup') + { + return $this->_cleanDir($this->_cacheDir, $group, $mode); + } + + /** + * Set to debug mode + * + * When an error is found, the script will stop and the message will be displayed + * (in debug mode only). + * + * @access public + */ + function setToDebug() + { + $this->_pearErrorMode = CACHE_LITE_ERROR_DIE; + } + + /** + * Set a new life time + * + * @param int $newLifeTime new life time (in seconds) + * @access public + */ + function setLifeTime($newLifeTime) + { + $this->_lifeTime = $newLifeTime; + $this->_refreshTime = time() - $newLifeTime; + } + + /** + * Save the state of the caching memory array into a cache file cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @access public + */ + function saveMemoryCachingState($id, $group = 'default') + { + if ($this->_caching) { + $array = array( + 'counter' => $this->_memoryCachingCounter, + 'array' => $this->_memoryCachingState + ); + $data = serialize($array); + $this->save($data, $id, $group); + } + } + + /** + * Load the state of the caching memory array from a given cache file cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @access public + */ + function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false) + { + if ($this->_caching) { + if ($data = $this->get($id, $group, $doNotTestCacheValidity)) { + $array = unserialize($data); + $this->_memoryCachingCounter = $array['counter']; + $this->_memoryCachingArray = $array['array']; + } + } + } + + /** + * Return the cache last modification time + * + * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY ! + * + * @return int last modification time + */ + function lastModified() { + return @filemtime($this->_file); + } + + /** + * Trigger a PEAR error + * + * To improve performances, the PEAR.php file is included dynamically. + * The file is so included only when an error is triggered. So, in most + * cases, the file isn't included and perfs are much better. + * + * @param string $msg error message + * @param int $code error code + * @access public + */ + function raiseError($msg, $code) + { + include_once(dirname(__FILE__) . '/../PEAR.php'); + PEAR::raiseError($msg, $code, $this->_pearErrorMode); + } + + // --- Private methods --- + + /** + * Remove a file + * + * @param string $file complete file path and name + * @return boolean true if no problem + * @access private + */ + function _unlink($file) + { + if (!@unlink($file)) { + $this->raiseError('Cache_Lite : Unable to remove cache !', -3); + return false; + } else { + return true; + } + } + + /** + * Recursive function for cleaning cache file in the given directory + * + * @param string $dir directory complete path (with a trailing slash) + * @param string $group name of the cache group + * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup', + 'callback_myFunction' + * @return boolean true if no problem + * @access private + */ + function _cleanDir($dir, $group = false, $mode = 'ingroup') + { + if ($this->_fileNameProtection) { + $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_'; + } else { + $motif = ($group) ? 'cache_'.$group.'_' : 'cache_'; + } + if ($this->_memoryCaching) { + while (list($key, $value) = each($this->_memoryCachingArray)) { + if (strpos($key, $motif, 0)) { + unset($this->_memoryCachingArray[$key]); + $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1; + } + } + if ($this->_onlyMemoryCaching) { + return true; + } + } + if (!($dh = opendir($dir))) { + $this->raiseError('Cache_Lite : Unable to open cache directory !', -4); + return false; + } + $result = true; + while ($file = readdir($dh)) { + if (($file != '.') && ($file != '..')) { + if (substr($file, 0, 6)=='cache_') { + $file2 = $dir . $file; + if (is_file($file2)) { + switch (substr($mode, 0, 9)) { + case 'old': + // files older than lifeTime get deleted from cache + if ((mktime() - filemtime($file2)) > $this->_lifeTime) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'notingrou': + if (!strpos($file2, $motif, 0)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'callback_': + $func = substr($mode, 9, strlen($mode) - 9); + if ($func($file2, $group)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'ingroup': + default: + if (strpos($file2, $motif, 0)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + } + } + if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) { + $result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode))); + } + } + } + } + return $result; + } + + /** + * Add some date in the memory caching array + * + * @param string $id cache id + * @param string $data data to cache + * @access private + */ + function _memoryCacheAdd($id, $data) + { + $this->_memoryCachingArray[$this->_file] = $data; + if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) { + list($key, $value) = each($this->_memoryCachingArray); + unset($this->_memoryCachingArray[$key]); + } else { + $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1; + } + } + + /** + * Make a file name (with path) + * + * @param string $id cache id + * @param string $group name of the group + * @access private + */ + function _setFileName($id, $group) + { + + if ($this->_fileNameProtection) { + $suffix = 'cache_'.md5($group).'_'.md5($id); + } else { + $suffix = 'cache_'.$group.'_'.$id; + } + $root = $this->_cacheDir; + if ($this->_hashedDirectoryLevel>0) { + $hash = md5($suffix); + for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) { + $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/'; + } + } + $this->_fileName = $suffix; + $this->_file = $root.$suffix; + } + + /** + * Read the cache file and return the content + * + * @return string content of the cache file + * @access private + */ + function _read() + { + $fp = @fopen($this->_file, "rb"); + if ($this->_fileLocking) @flock($fp, LOCK_SH); + if ($fp) { + clearstatcache(); // because the filesize can be cached by PHP itself... + $length = @filesize($this->_file); + $mqr = get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + if ($this->_readControl) { + $hashControl = @fread($fp, 32); + $length = $length - 32; + } + if ($length) { + $data = @fread($fp, $length); + } else { + $data = ''; + } + set_magic_quotes_runtime($mqr); + if ($this->_fileLocking) @flock($fp, LOCK_UN); + @fclose($fp); + if ($this->_readControl) { + $hashData = $this->_hash($data, $this->_readControlType); + if ($hashData != $hashControl) { + @touch($this->_file, time() - 2*abs($this->_lifeTime)); + return false; + } + } + return $data; + } + $this->raiseError('Cache_Lite : Unable to read cache !', -2); + return false; + } + + /** + * Write the given data in the cache file + * + * @param string $data data to put in cache + * @return boolean true if ok + * @access private + */ + function _write($data) + { + $try = 1; + while ($try<=2) { + $fp = @fopen($this->_file, "wb"); + if ($fp) { + if ($this->_fileLocking) @flock($fp, LOCK_EX); + if ($this->_readControl) { + @fwrite($fp, $this->_hash($data, $this->_readControlType), 32); + } + $len = strlen($data); + @fwrite($fp, $data, $len); + if ($this->_fileLocking) @flock($fp, LOCK_UN); + @fclose($fp); + return true; + } else { + if (($try==1) and ($this->_hashedDirectoryLevel>0)) { + $hash = md5($this->_fileName); + $root = $this->_cacheDir; + for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) { + $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/'; + @mkdir($root, $this->_hashedDirectoryUmask); + } + $try = 2; + } else { + $try = 999; + } + } + } + $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1); + return false; + } + + /** + * Write the given data in the cache file and control it just after to avoir corrupted cache entries + * + * @param string $data data to put in cache + * @return boolean true if the test is ok + * @access private + */ + function _writeAndControl($data) + { + $this->_write($data); + $dataRead = $this->_read($data); + return ($dataRead==$data); + } + + /** + * Make a control key with the string containing datas + * + * @param string $data data + * @param string $controlType type of control 'md5', 'crc32' or 'strlen' + * @return string control key + * @access private + */ + function _hash($data, $controlType) + { + switch ($controlType) { + case 'md5': + return md5($data); + case 'crc32': + return sprintf('% 32d', crc32($data)); + case 'strlen': + return sprintf('% 32d', strlen($data)); + default: + $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5); + } + } + +} + +?> _____ Added: vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE --- vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,10 @@ +- Replace: +Request.php: +require_once('PEAR.php'); +require_once(dirname(__FILE__) . '/../PEAR.php'); + +require_once('Net/Socket.php'); +require_once(dirname(__FILE__) . '/../Net/Socket.php'); + +require_once('Net/URL.php'); +require_once(dirname(__FILE__) . '/../Net/URL.php'); [truncated at 1000 lines; 165701 more skipped]

1 0

[weiden] 20988: return the result in NtPrivilegeCheck
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

return the result in NtPrivilegeCheck Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/se/priv.c --- trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:49:04 UTC (rev 20987) +++ trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:49:49 UTC (rev 20988) @@ -393,7 +393,8 @@ { RtlCopyMemory(RequiredPrivileges->Privilege, Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES));; + PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); + *Result = CheckResult; Status = STATUS_SUCCESS; } _SEH_HANDLE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs