Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dchapyshev] 39580: - Add LCIDToLocaleName from Wine. Used by Wine Gecko
by dchapyshev＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: dchapyshev Date: Fri Feb 13 06:04:20 2009 New Revision: 39580 URL: http://svn.reactos.org/svn/reactos?rev=39580&view=rev Log: - Add LCIDToLocaleName from Wine. Used by Wine Gecko Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Fri Feb 13 06:04:20 2009 @@ -601,7 +601,7 @@ @ stdcall IsValidLocale(long long) @ stdcall IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) -@ stub LCIDToLocaleName # missed in XP SP3 +@ stdcall LCIDToLocaleName(long wstr long long) # needed for wine gecko; missed in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Fri Feb 13 06:04:20 2009 @@ -3042,3 +3042,13 @@ { return GetLocaleInfoW( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); } + +/*********************************************************************** + * LCIDToLocaleName (KERNEL32.@) Wine 13.02.2009 + */ +INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) +{ + if (flags) DPRINT1( "unsupported flags %x\n", flags ); + + return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); +}

1 0

[cwittich] 39579: -use ExAllocatePoolWithTag/ExFreePoolWithTag -set FileObject to readonly -register the filesystem as low priority
by cwittich＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: cwittich Date: Fri Feb 13 05:48:06 2009 New Revision: 39579 URL: http://svn.reactos.org/svn/reactos?rev=39579&view=rev Log: -use ExAllocatePoolWithTag/ExFreePoolWithTag -set FileObject to readonly -register the filesystem as low priority Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Fri Feb 13 05:48:06 2009 @@ -104,6 +104,8 @@ CdfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead = CdfsAcquireForLazyWrite; CdfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = CdfsReleaseFromLazyWrite; + DeviceObject->Flags |= DO_LOW_PRIORITY_FILESYSTEM; + IoRegisterFileSystem(DeviceObject); DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Fri Feb 13 05:48:06 2009 @@ -68,9 +68,9 @@ if (Ccb->DirectorySearchPattern.Buffer) { - ExFreePool(Ccb->DirectorySearchPattern.Buffer); + ExFreePoolWithTag(Ccb->DirectorySearchPattern.Buffer, TAG_CCB); } - ExFreePool(Ccb); + ExFreePoolWithTag(Ccb, TAG_CCB); return(STATUS_SUCCESS); } Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Fri Feb 13 05:48:06 2009 @@ -590,7 +590,7 @@ { First = TRUE; Ccb->DirectorySearchPattern.Buffer = - ExAllocatePool(NonPagedPool, SearchPattern->Length + sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_CCB); if (Ccb->DirectorySearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -608,7 +608,7 @@ else if (Ccb->DirectorySearchPattern.Buffer == NULL) { First = TRUE; - Ccb->DirectorySearchPattern.Buffer = ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_CCB); if (Ccb->DirectorySearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Fri Feb 13 05:48:06 2009 @@ -246,6 +246,9 @@ RtlZeroMemory(newCCB, sizeof(CCB)); + FileObject->ReadAccess = TRUE; + FileObject->WriteAccess = FALSE; + FileObject->DeleteAccess = FALSE; FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->FsContext = Fcb; FileObject->FsContext2 = newCCB; Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Fri Feb 13 05:48:06 2009 @@ -385,6 +385,9 @@ RtlZeroMemory(Ccb, sizeof(CCB)); + DeviceExt->StreamFileObject->ReadAccess = TRUE; + DeviceExt->StreamFileObject->WriteAccess = FALSE; + DeviceExt->StreamFileObject->DeleteAccess = FALSE; DeviceExt->StreamFileObject->FsContext = Fcb; DeviceExt->StreamFileObject->FsContext2 = Ccb; DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;

1 0

[fireball] 39578: Igor Koshpaev <tower@reactos.org> - Include missing modules into bootcd
by fireball＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: fireball Date: Fri Feb 13 05:20:59 2009 New Revision: 39578 URL: http://svn.reactos.org/svn/reactos?rev=39578&view=rev Log: Igor Koshpaev <tower(a)reactos.org> - Include missing modules into bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Feb 13 05:20:59 2009 @@ -649,9 +649,112 @@ modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional modules\rosapps\templates\dialog\dialog.exe 1 optional - +modules\rostests\apitests\dciman32api\dciman32api.exe 7 optional +modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional +modules\rostests\apitests\user32api\user32api.exe 7 optional + +modules\rostests\apitests\w32kdll\w32kdll_2k3sp2\w32kdll_2k3sp2.dll 1 optional +modules\rostests\apitests\w32kdll\w32kdll_2ksp4\w32kdll_2ksp4.dll 1 optional +modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 1 optional +modules\rostests\apitests\w32kdll\w32kdll_xpsp2\w32kdll_xpsp2.dll 1 optional + +modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional +modules\rostests\apitests\ws2_32\ws2_32_apitests.exe 7 optional +modules\rostests\dibtests\alphablend\alphablend.exe 7 optional +modules\rostests\dibtests\bitblt\bitblt.exe 7 optional +modules\rostests\dibtests\bltrop\bltrop.exe 7 optional +modules\rostests\dibtests\dibtest\dibtest.exe 7 optional +modules\rostests\dibtests\icontest\icontest.exe 7 optional +modules\rostests\dibtests\palbitblt\palbitblt.exe 7 optional +modules\rostests\dibtests\patblt\patblt.exe 7 optional +modules\rostests\dibtests\stretchblt\stretchblt.exe 7 optional +modules\rostests\dibtests\vbltest\vbltest.exe 7 optional +modules\rostests\drivers\csqtest\csqtest.sys 7 optional +modules\rostests\drivers\kmtest\kmtest.sys 7 optional +modules\rostests\drivers\memtest\memtest.sys 7 optional modules\rostests\rosautotest\rosautotest.exe 1 optional +modules\rostests\tests\accelerator\accelerator.exe 7 optional +modules\rostests\tests\alive\alive.exe 7 optional +modules\rostests\tests\apc\apc.exe 7 optional +modules\rostests\tests\apc2\apc2.exe 7 optional +modules\rostests\tests\args\args.exe 7 optional +modules\rostests\tests\atomtest\atomtest.exe 7 optional +modules\rostests\tests\bench\bench-thread.exe 7 optional +modules\rostests\tests\button\button.exe 7 optional +modules\rostests\tests\button2\buttontst2.exe 7 optional +modules\rostests\tests\capclock\capclock.exe 7 optional +modules\rostests\tests\carets\carets.exe 7 optional +modules\rostests\tests\combotst\combotst.exe 7 optional +modules\rostests\tests\consume\consume.exe 7 optional +modules\rostests\tests\copymove\copymove.exe 7 optional +modules\rostests\tests\count\count.exe 7 optional +modules\rostests\tests\create-links\create-links.exe 7 optional +modules\rostests\tests\D3DParseUnknownCommand_show\D3DParseUnknownCommand_show.exe 7 optional +modules\rostests\tests\dirdlg\dirdlg.exe 7 optional +modules\rostests\tests\diskspeed\diskspeed.exe 7 optional +modules\rostests\tests\dnsapi\dnsapitst.exe 7 optional +modules\rostests\tests\dnsquery\dnsquery.exe 7 optional +modules\rostests\tests\DxHalTest\dxhaltest.exe 7 optional +modules\rostests\tests\edit\edit.exe 7 optional +modules\rostests\tests\enhmetafile\enhmetafile.exe 7 optional +modules\rostests\tests\enumfonts\enumfonts.exe 7 optional +modules\rostests\tests\enumwnd\enumwnd.exe 7 optional +modules\rostests\tests\enumws\enumws.exe 7 optional +modules\rostests\tests\event\event.exe 7 optional +modules\rostests\tests\fiber\fiber.exe 7 optional +modules\rostests\tests\gethostbyname\gethostbyname.exe 7 optional +modules\rostests\tests\global_mem\global_mem.exe 7 optional +modules\rostests\tests\gradient\gradient.exe 7 optional +modules\rostests\tests\hello\hello.exe 7 optional +modules\rostests\tests\hivetest\hivetest.exe 7 optional +modules\rostests\tests\Imagelistviewer\Imagelistviewer.exe 7 optional +modules\rostests\tests\isotest\isotest.exe 7 optional +modules\rostests\tests\lineclip\lineclip.exe 7 optional +modules\rostests\tests\linetest\linetest.exe 7 optional +modules\rostests\tests\map_dup_inherit\map_dup_inherit.exe 7 optional +modules\rostests\tests\mdi\mdi.exe 7 optional +modules\rostests\tests\miditest\miditest.exe 7 optional +modules\rostests\tests\mktime\mktime.exe 7 optional +modules\rostests\tests\moztest\moztest.exe 7 optional +modules\rostests\tests\multithrdwin\multithrdwin.exe 7 optional +modules\rostests\tests\multiwin\multiwin.exe 7 optional +modules\rostests\tests\mutex\mutex.exe 7 optional +modules\rostests\tests\nameserverlist\nameserverlist.exe 7 optional +modules\rostests\tests\noexecute\noexecute.exe 7 optional +modules\rostests\tests\p_dup_handle\p_dup_handle.exe 7 optional +modules\rostests\tests\polytest\polytest.exe 7 optional +modules\rostests\tests\popupmenu\popupmenu.exe 7 optional +modules\rostests\tests\primitives\primitives.exe 7 optional modules\rostests\tests\pseh2\pseh2_test.exe 7 optional +modules\rostests\tests\readconsole\readconsole.exe 7 optional +modules\rostests\tests\regqueryvalue\regqueryvalue.exe 7 optional +modules\rostests\tests\sectest\sectest.exe 7 optional +modules\rostests\tests\sertest\sertest.exe 7 optional +modules\rostests\tests\shaptest\shaptest.exe 7 optional +modules\rostests\tests\statst\statst.exe 7 optional +modules\rostests\tests\statst2\statst2.exe 7 optional +modules\rostests\tests\subclass\subclass.exe 7 optional +modules\rostests\tests\suspend\suspend.exe 7 optional +modules\rostests\tests\tcpsvr\tcpsvr.exe 7 optional +modules\rostests\tests\terminate\terminate.exe 7 optional +modules\rostests\tests\thread\thread.exe 7 optional +modules\rostests\tests\thread_msg\thread_msg.exe 7 optional +modules\rostests\tests\threadwait\threadwait.exe 7 optional +modules\rostests\tests\tmrqueue\tmrqueue.exe 7 optional +modules\rostests\tests\txtscale\txtscale.exe 7 optional +modules\rostests\tests\vmtest\vmtest.exe 7 optional +modules\rostests\tests\wclickat\wclickat.exe 7 optional +modules\rostests\tests\wcstombs-tests\wcstombs-tests.exe 7 optional +modules\rostests\tests\winhello\winhello.exe 7 optional +modules\rostests\tests\wm_erasebkgnd\wm_erasebkgnd.exe 7 optional +modules\rostests\tests\wm_paint\wm_paint.exe 7 optional +modules\rostests\win32\kernel32\queuetest\queuetest.exe 7 optional +modules\rostests\win32\kmtloader\kmtloader.exe 7 optional +modules\rostests\win32\smss\movefile\movefiletest.exe 7 optional +modules\rostests\win32\user32\drawcaption\capicon.exe 7 optional +modules\rostests\win32\user32\drawcaption\drawcap.exe 7 optional +modules\rostests\win32\user32\kbdlayout\kbdlayout.exe 7 optional +modules\rostests\win32\user32\sysicon\sysicon.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

1 0

[dgorbachev] 39577: Update Slovak translations, fix formatting. Bug #4157. Mario Kacmar (kario-at-szm-dot-sk)
by dgorbachev＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: dgorbachev Date: Fri Feb 13 03:06:51 2009 New Revision: 39577 URL: http://svn.reactos.org/svn/reactos?rev=39577&view=rev Log: Update Slovak translations, fix formatting. Bug #4157. Mario Kacmar (kario-at-szm-dot-sk) Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/no-NO.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-…

1 0

[dchapyshev] 39576: - Update Russian translation
by dchapyshev＠svn.reactos.org 13 Feb '09

13 Feb '09

Author: dchapyshev Date: Fri Feb 13 01:50:42 2009 New Revision: 39576 URL: http://svn.reactos.org/svn/reactos?rev=39576&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Fri Feb 13 01:50:42 2009 @@ -21,7 +21,7 @@ IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Properties" +CAPTION "Ñâîéñòâà" FONT 8, "MS Shell Dlg" BEGIN END @@ -60,37 +60,37 @@ LTEXT "Ìàñêà ïîäñåòè:", -1, 22, 48, 80, 8 LTEXT "Øëþç ïî óìîë÷àíèþ:", -1, 22, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "í/à", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14 END -IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200, 172 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Äåòàëè ñåòåâîãî ïîäêëþ÷åíèÿ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 - CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + LTEXT "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ñåòè:", -1, 5, 4, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 5, 17, 190, 130 + PUSHBUTTON "&Çàêðûòü", IDC_CLOSE, 132, 153, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" + IDS_PHYSICAL_ADDRESS "Ôèçè÷åñêèé àäðåñ" + IDS_IP_ADDRESS "IP-àäðåñ" + IDS_SUBNET_MASK "Ìàñêà ïîäñåòè" + IDS_DEF_GATEWAY "Îñíîâíîé øëþç" + IDS_DHCP_SERVER "DHCP-ñåðâåð" + IDS_LEASE_OBTAINED "Àðåíäà ïîëó÷åíà" + IDS_LEASE_EXPIRES "Àðåíäà èñòåêàåò" + IDS_DNS_SERVERS "DNS-ñåðâåðû" + IDS_WINS_SERVERS "WINS-ñåðâåð" + IDS_PROPERTY "Ñâîéñòâî" + IDS_VALUE "Çíà÷åíèå" IDS_NETWORKCONNECTION "Ñåòåâûå ïîäêëþ÷åíèÿ" IDS_SHV_COLUMN_NAME "Èìÿ" IDS_SHV_COLUMN_TYPE "Òèï" @@ -118,8 +118,8 @@ IDS_FORMAT_KBIT "%u ÊÁàéò/s" IDS_FORMAT_MBIT "%u ÌÁàéò/s" IDS_FORMAT_GBIT "%u ÃÁàéò/s" - IDS_DURATION_DAY "%d Äåíü %s" - IDS_DURATION_DAYS "%d Äíåé %s" + IDS_DURATION_DAY "%d äåíü %s" + IDS_DURATION_DAYS "%d äíåé %s" IDS_ASSIGNED_DHCP "Ïðèñâîåí DHCP" IDS_ASSIGNED_MANUAL "Íàñòðîåí âðó÷íóþ" END

1 0

[khornicek] 39575: - don't redirect to nonexistent functions, Dd* are only defines
by khornicek＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: khornicek Date: Thu Feb 12 17:06:01 2009 New Revision: 39575 URL: http://svn.reactos.org/svn/reactos?rev=39575&view=rev Log: - don't redirect to nonexistent functions, Dd* are only defines Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Thu Feb 12 17:06:01 2009 @@ -267,22 +267,22 @@ @ stdcall GdiDrawStream(ptr long ptr) @ stdcall GdiEndDocEMF(ptr) @ stdcall GdiEndPageEMF(ptr long) -@ stdcall GdiEntry10(ptr long) gdi32.DdReenableDirectDrawObject -@ stdcall GdiEntry11(ptr ptr) gdi32.DdAttachSurface -@ stdcall GdiEntry12(ptr ptr) gdi32.DdUnattachSurface -@ stdcall GdiEntry13() gdi32.DdQueryDisplaySettingsUniqueness -@ stdcall GdiEntry14(ptr ptr long) gdi32.DdGetDxHandle -@ stdcall GdiEntry15(ptr ptr ptr) gdi32.DdSetGammaRamp -@ stdcall GdiEntry16(ptr ptr ptr) gdi32.DdSwapTextureHandles -@ stdcall GdiEntry1(ptr ptr) gdi32.DdCreateDirectDrawObject -@ stdcall GdiEntry2(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdQueryDirectDrawObject -@ stdcall GdiEntry3(ptr) gdi32.DdDeleteDirectDrawObject -@ stdcall GdiEntry4(ptr long) gdi32.DdCreateSurfaceObject -@ stdcall GdiEntry5(ptr) gdi32.DdDeleteSurfaceObject -@ stdcall GdiEntry6(ptr ptr) gdi32.DdResetVisrgn -@ stdcall GdiEntry7(ptr ptr) gdi32.DdGetDC -@ stdcall GdiEntry8(ptr) gdi32.DdReleaseDC -@ stdcall GdiEntry9(ptr ptr ptr ptr ptr ptr) gdi32.DdCreateDIBSection +@ stdcall GdiEntry10(ptr long) +@ stdcall GdiEntry11(ptr ptr) +@ stdcall GdiEntry12(ptr ptr) +@ stdcall GdiEntry13() +@ stdcall GdiEntry14(ptr ptr long) +@ stdcall GdiEntry15(ptr ptr ptr) +@ stdcall GdiEntry16(ptr ptr ptr) +@ stdcall GdiEntry1(ptr ptr) +@ stdcall GdiEntry2(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall GdiEntry3(ptr) +@ stdcall GdiEntry4(ptr long) +@ stdcall GdiEntry5(ptr) +@ stdcall GdiEntry6(ptr ptr) +@ stdcall GdiEntry7(ptr ptr) +@ stdcall GdiEntry8(ptr) +@ stdcall GdiEntry9(ptr ptr ptr ptr ptr ptr) @ stdcall GdiFixUpHandle(ptr) @ stdcall GdiFlush() @ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl

1 0

[dgoette] 39574: * DBConnection.class.php remove unneeded code, spotted by Colin * introducing RosCMS Instances, it's basically a different configuration that you can put into a different folder and use the same code base to maintain different sites (example included)
by dgoette＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dgoette Date: Thu Feb 12 15:11:12 2009 New Revision: 39574 URL: http://svn.reactos.org/svn/reactos?rev=39574&view=rev Log: * DBConnection.class.php remove unneeded code, spotted by Colin * introducing RosCMS Instances, it's basically a different configuration that you can put into a different folder and use the same code base to maintain different sites (example included) Added: branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/js/cms_website-init.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_ACL.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_Groups.class… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_System.class… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SmartFilte… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_User.class… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Activate.cl… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_LostPasswor… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Profile.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_ProfileEdit… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Register.cl… Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -44,34 +44,37 @@ $config->setSiteTimezone(-2); // time difference to utc time from server time $config->setPathRoscms('/reactos/roscms/'); // path to roscms files +$config->setPathInstance('/reactos/roscms/'); // path to roscms files $config->setPathGenerationCache('../roscms_cache/'); // path to generated files (relative to roscms folder) $config->setPathGenerated('../'); // path to generated files (relative to roscms folder) // RosCMS Table Names -define('ROSCMST_AREA' , 'roscms_area'); -define('ROSCMST_USERS' , 'roscms_accounts'); -define('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); -define('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); -define('ROSCMST_COUNTRIES' , 'roscms_countries'); -define('ROSCMST_ENTRIES' , 'roscms_entries'); -define('ROSCMST_ACCESS' , 'roscms_entries_access'); -define('ROSCMST_RIGHTS' , 'roscms_entries_areas'); -define('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); -define('ROSCMST_STEXT' , 'roscms_entries_stext'); -define('ROSCMST_TAGS' , 'roscms_entries_tags'); -define('ROSCMST_TEXT' , 'roscms_entries_text'); -define('ROSCMST_FILTER' , 'roscms_filter'); -define('ROSCMST_GROUPS' , 'roscms_groups'); -define('ROSCMST_JOBS' , 'roscms_jobs'); -define('ROSCMST_LANGUAGES' , 'roscms_languages'); -define('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); -define('ROSCMST_MEMBERSHIPS', 'roscms_rel_groups_accounts'); -define('ROSCMST_AREA_ACCESS', 'roscms_rel_groups_area'); -define('ROSCMST_DEPENCIES' , 'roscms_rel_revisions_depencies'); -define('ROSCMST_ACL' , 'roscms_rel_acl'); -define('ROSCMST_TIMEZONES' , 'roscms_timezones'); +$config->setTable('ROSCMST_AREA' , 'roscms_area'); +$config->setTable('ROSCMST_USERS' , 'roscms_accounts'); +$config->setTable('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); +$config->setTable('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); +$config->setTable('ROSCMST_COUNTRIES' , 'roscms_countries'); +$config->setTable('ROSCMST_ENTRIES' , 'roscms_entries'); +$config->setTable('ROSCMST_ACCESS' , 'roscms_entries_access'); +$config->setTable('ROSCMST_RIGHTS' , 'roscms_entries_areas'); +$config->setTable('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); +$config->setTable('ROSCMST_STEXT' , 'roscms_entries_stext'); +$config->setTable('ROSCMST_TAGS' , 'roscms_entries_tags'); +$config->setTable('ROSCMST_TEXT' , 'roscms_entries_text'); +$config->setTable('ROSCMST_FILTER' , 'roscms_filter'); +$config->setTable('ROSCMST_GROUPS' , 'roscms_groups'); +$config->setTable('ROSCMST_JOBS' , 'roscms_jobs'); +$config->setTable('ROSCMST_LANGUAGES' , 'roscms_languages'); +$config->setTable('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); +$config->setTable('ROSCMST_MEMBERSHIPS', 'roscms_rel_groups_accounts'); +$config->setTable('ROSCMST_AREA_ACCESS', 'roscms_rel_groups_area'); +$config->setTable('ROSCMST_DEPENCIES' , 'roscms_rel_revisions_depencies'); +$config->setTable('ROSCMST_ACL' , 'roscms_rel_acl'); +$config->setTable('ROSCMST_TIMEZONES' , 'roscms_timezones'); +// do not change, it's needed to apply those config settings +$config->apply(); ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website-init.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website-init.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website-init.js [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -37,11 +37,11 @@ } // load user filter -document.getElementById('labtitel2c').innerHTML = '<div align="right"><img src="images/ajax_loading.gif" alt="loading ..." style="width:13px; height:13px;" /></div>'; +document.getElementById('labtitel2c').innerHTML = '<div align="right"><img src="'+roscms_intern_webserver_roscms+'images/ajax_loading.gif" alt="loading ..." style="width:13px; height:13px;" /></div>'; makeRequest('?page=backend&type=text&subtype=ufs&d_val=load', 'ufs', 'labtitel2c', 'html', 'GET', ''); // load user labels -document.getElementById('labtitel3c').innerHTML = '<div align="right"><img src="images/ajax_loading.gif" alt="loading ..." style="width:13px; height:13px;" /></div>'; +document.getElementById('labtitel3c').innerHTML = '<div align="right"><img src="'+roscms_intern_webserver_roscms+'images/ajax_loading.gif" alt="loading ..." style="width:13px; height:13px;" /></div>'; makeRequest('?page=backend&type=text&subtype=ut', 'ut', 'labtitel3c', 'html', 'GET', ''); if (readCookie('labtitel1') == 0) TabOpenCloseEx('labtitel1'); Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -837,7 +837,7 @@ autosave_timer = window.setTimeout("tryAutosave()", autosave_coundown); // loading screen: - document.getElementById('editzone').innerHTML = '<div style="background:white; border-bottom: 1px solid #bbb; border-right: 1px solid #bbb;margin:10px;padding: 2em 0px;width:95%;text-align: center;"><img src="images/ajax_loading.gif" alt="loading ..." style="width:13px;height:13px;" />  loading ...</div>'; + document.getElementById('editzone').innerHTML = '<div style="background:white; border-bottom: 1px solid #bbb; border-right: 1px solid #bbb;margin:10px;padding: 2em 0px;width:95%;text-align: center;"><img src="'+roscms_intern_webserver_roscms+'images/ajax_loading.gif" alt="loading ..." style="width:13px;height:13px;" />  loading ...</div>'; makeRequest('?page=backend&type=text&subtype=mef&d_fl='+objevent+'&d_id='+devideids2+'&d_r_id='+devideids3+'&d_r_lang='+userlang, 'mef', 'editzone', 'html', 'GET', ''); } @@ -1742,7 +1742,7 @@ }; // internal function end if (kind === 'POST') { - http_request.open('POST', url, true); + http_request.open('POST', roscms_intern_webserver_roscms+url, true); http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); http_request.setRequestHeader("Content-length", parameters.length); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache @@ -1750,7 +1750,7 @@ http_request.send(parameters); } else { - http_request.open('GET', url, true); + http_request.open('GET', roscms_intern_webserver_roscms+url, true); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache http_request.send(null); } @@ -1840,7 +1840,7 @@ // not found -> readonly if (security.indexOf("write") < 0 ) { - lstBody += '<img src="images/locked.gif" alt="read-only" style="width:11px; height:12px; border:0px;" /> '; + lstBody += '<img src="'+roscms_intern_webserver_roscms+'images/locked.gif" alt="read-only" style="width:11px; height:12px; border:0px;" /> '; } try { @@ -2772,7 +2772,7 @@ } lstfilterstr += htmlFilterValues(lstfilterstr2[0], lstfilterstr2[3], indexid) - + '   <span id="fdel'+indexid+'" class="filterbutton" onclick="removeFilter(this.id)"><img src="images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" /> Delete</span>' + + '   <span id="fdel'+indexid+'" class="filterbutton" onclick="removeFilter(this.id)"><img src="'+roscms_intern_webserver_roscms+'images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" /> Delete</span>' + '</div>'; if (lstfilterstr2[3] == 0) { Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -20,7 +20,10 @@ define('ROSCMS_PATH', '../'); require('../lib/RosCMS_Autoloader.class.php'); -Login::required(); + +// config data +require_once(ROSCMS_PATH.'config.php'); +RosCMS::getInstance()->apply(); // get user language $thisuser = ThisUser::getInstance(); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -37,18 +37,18 @@ */ public function __construct() { - global $db_host, $db_host, $db_user, $db_pass, $db_port; - include_once(ROSCMS_PATH.'connect.db.php'); + // load database authentification config + require_once(ROSCMS_PATH.'connect.db.php'); try { parent::__construct('mysql:dbname='.$db_name.';host='.$db_host.';port='.$db_port, $db_user, $db_pass); // unset loaded db config - unset($GLOBALS['db_name']); - unset($GLOBALS['db_host']); - unset($GLOBALS['db_user']); - unset($GLOBALS['db_pass']); - unset($GLOBALS['db_port']); + unset($db_name); + unset($db_host); + unset($db_user); + unset($db_pass); + unset($db_port); // show errors as warning, and use our own statement class $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -80,16 +80,18 @@ */ protected function header( ) { + $config = &RosCMS::getInstance(); + // this page was generated in ... $roscms_gentime = explode(' ',microtime()); - $this->page_start = $roscms_gentime[1] + $roscms_gentime[0]; + $this->page_start = $roscms_gentime[1] + $roscms_gentime[0]; // output header echo_strip( ' <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html lang="en"> <head> - <title>ReactOS '.(($this->title!=='') ? '- '.$this->title : '').'</title> + <title>'.$config->systemBrand().' '.(($this->title!=='') ? '- '.$this->title : '').'</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Pragma" content="no-cache" /> <meta name="Copyright" content="ReactOS Foundation" /> @@ -103,16 +105,16 @@ // link css files (use register_css method) foreach($this->css_files as $file) { if ($file['condition'] === false) { - echo '<link href="'.RosCMS::getInstance()->pathRosCMS().'css/'.$file['name'].'" type="text/css" rel="stylesheet" />'; + echo '<link href="'.$config->pathRosCMS().'css/'.$file['name'].'" type="text/css" rel="stylesheet" />'; } else { - echo ''; + echo ''; } } // link js files (use register_js method) foreach($this->js_files as $file) { - echo '<script src="'.RosCMS::getInstance()->pathRosCMS().'js/'.$file.'" type="text/javascript"></script>'; + echo '<script src="'.$config->pathRosCMS().'js/'.$file.'" type="text/javascript"></script>'; } //@TODO remove those static links from here @@ -121,11 +123,11 @@ <body> <div id="top"> <div id="topMenu"> - <a href="'.RosCMS::getInstance()->pathGenerated().'?page=index">Home</a> <span>|</span> - <a href="'.RosCMS::getInstance()->pathGenerated().'?page=about">Info</a> <span>|</span> - <a href="'.RosCMS::getInstance()->pathGenerated().'?page=community">Community</a> <span>|</span> - <a href="'.RosCMS::getInstance()->pathGenerated().'?page=dev">Developement</a> <span>|</span> - <a href="'.RosCMS::getInstance()->pathRosCMS().'?page=user">myRosCMS</a> + <a href="'.$config->pathGenerated().'?page=index">Home</a> <span>|</span> + <a href="'.$config->pathGenerated().'?page=about">Info</a> <span>|</span> + <a href="'.$config->pathGenerated().'?page=community">Community</a> <span>|</span> + <a href="'.$config->pathGenerated().'?page=dev">Developement</a> <span>|</span> + <a href="'.$config->pathInstance().'?page=user">myRosCMS</a> </div> </div>'); } // end of member function header Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -95,11 +95,11 @@ <strong>'.$thisuser->name().'</strong> ('. $group_list .') | <span onclick="refreshPage()" style="color:#006090; cursor:pointer;"> - <img src="images/reload.gif" alt="reload page" width="16" height="16" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/reload.gif" alt="reload page" width="16" height="16" /> <span style="text-decoration:underline;">reload</span> </span> | - <a href="'.RosCMS::getInstance()->pathRosCMS().'?page=logout">Sign out</a> + <a href="'.RosCMS::getInstance()->pathInstance().'?page=logout">Sign out</a> </div> <div id="roscms_page"> <table id="mt" cellpadding="0" cellspacing="0"> @@ -182,7 +182,7 @@ echo_strip(' <td style="width:100%"> <div id="ajaxloadinginfo" style="visibility:hidden; text-align: center;"> - <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> </div> </td> </tr> @@ -199,7 +199,7 @@ break; case 'website': - echo_strip('Quick Links: <a href="'.RosCMS::getInstance()->pathRosCMS().'?page=data&branch=welcome#web_news_langgroup">Translation Group News</a> + echo_strip('Quick Links: <a href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=welcome#web_news_langgroup">Translation Group News</a> | <a href="'.RosCMS::getInstance()->pathGenerated().'?page=tutorial_roscms">Text- & Video-Tutorials</a> | <a href="'.RosCMS::getInstance()->pathGenerated().'/forum/viewforum.php?f=18">Website Forum</a>'); break; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -81,7 +81,7 @@ <li><a href="'.$config->pathGenerated().'en/about.html">Info</a></li> <li><a href="'.$config->pathGenerated().'en/community.html">Community</a></li> <li><a href="'.$config->pathGenerated().'en/dev.html">Development</a></li> - <li><a href="'.$config->pathRosCMS().'?page=user">myReactOS</a></li> + <li><a href="'.$config->pathInstance().'?page=user">myReactOS</a></li> </ul>'); // Menu for logged in user @@ -90,11 +90,11 @@ <h2>Account</h2> <ul> <li title="'.$thisuser->name().'"> Nick: '.substr($thisuser->name(), 0, 9).'</li> - <li><a href="'.$config->pathRosCMS().'?page=my">My Profile</a></li> - <li><a href="'.$config->pathRosCMS().'?page=search">User Search</a></li> + <li><a href="'.$config->pathInstance().'?page=my">My Profile</a></li> + <li><a href="'.$config->pathInstance().'?page=search">User Search</a></li> <li><a href="'.$config->pathGenerated().'peoplemap/">User Map</a></li>'); if ($thisuser->hasAccess('CMS')) { - echo '<li><a href="'.$config->pathRosCMS().'?page=data&branch=welcome">RosCMS Interface</a></li>'; + echo '<li><a href="'.$config->pathInstance().'?page=data&branch=welcome">RosCMS Interface</a></li>'; } echo_strip(' <li><a href="?page=logout">Logout</a></li> @@ -106,8 +106,8 @@ echo_strip(' <h2>Account</h2> <ul> - <li><a href="'.$config->pathRosCMS().'?page=login">Login</a></li> - <li><a href="'.$config->pathRosCMS().'?page=register">Register</a></li> + <li><a href="'.$config->pathInstance().'?page=login">Login</a></li> + <li><a href="'.$config->pathInstance().'?page=register">Register</a></li> </ul>'); } @@ -128,7 +128,7 @@ <ul> <li> <div style="text-align:center;"> - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathRosCMS().'?'.htmlentities($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'"> + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathInstance().'?'.htmlentities($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'"> <optgroup label="current language">'); // print current language Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -17,10 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -global $roscms_subsystem_wiki_path; -$roscms_subsystem_wiki_path = '/reactos/wiki/index.php/'; // base adress for wiki pages /** * class RosCMS @@ -31,22 +27,23 @@ { // DO NOT MODIFY ANYTHING HERE (except you know what you're doing) - private $email_support = 'support at reactos.org'; // email to which users can send mails, if they got a problem - private $email_system = 'ReactOS<noreply(a)reactos.org>'; // mails which are send from the system and don't require a reply + private $email_support = null; // email to which users can send mails, if they got a problem + private $email_system = null; // mails which are send from the system and don't require a reply - private $cookie_user_key = 'roscmsusrkey'; // session key - private $cookie_user_name = 'roscmsusrname'; // user_name - private $cookie_password = 'rospassword'; // user_password (used for keep login function) - private $cookie_login_name = 'roscmslogon'; // where username is stored for 'save username' in login options - private $cookie_security = 'roscmsseckey'; // stores security settings - - private $site_name = 'ReactOS.org'; // sites name - private $site_language = 'en'; // standard language - private $site_timezone = -2; // time difference to utc time from server time - - private $path_generated = '../reactos/'; // path to generated files - private $path_generation_cache = '../reactos/roscms_cache'; // path to cache files while generation process - private $path_roscms = '/reactos/roscms/'; // path to roscms files + private $cookie_user_key = null; // session key + private $cookie_user_name = null; // user_name + private $cookie_password = null; // user_password (used for keep login function) + private $cookie_login_name = null; // where username is stored for 'save username' in login options + private $cookie_security = null; // stores security settings + + private $site_name = null; // sites name + private $site_language = null; // standard language + private $site_timezone = null; // time difference to utc time from server time + + private $path_generated = null; // path to generated files + private $path_generation_cache = null; // path to cache files while generation process + private $path_roscms = null; // path to roscms files + private $path_instance = null; // path to current roscms instance // system vars private $limit_username_min = 4; @@ -58,12 +55,17 @@ private $system_version = '4.0.0 alpha'; + private $applied = false; + private $config = array(); + + /** * returns an static instance * * @access public */ - public static function getInstance() { + public static function getInstance() + { static $instance; if (empty($instance)) { @@ -73,17 +75,48 @@ } // end of member function getInstance + + /** + * apply temporary config data, if not already set + * + * @access public + */ + public function apply() + { + + foreach ($this->config as $key => $val) { + if ($this->$key === null) $this->$key = $val; + } + $this->applied=true; + } // end of member function apply + + + + /** + * registers a new table name, if not already registered + * + * @access public + */ + public function setTable($table, $name) + { + if (!defined($table)) { + define($table, $name); + } + } // end of member function setTable + + + /** * getter functions */ - public function emailSupport() { return $this->email_support; } - public function emailSystem() { return $this-email_system; } - public function cookieUserKey() { return $this->cookie_user_key; } - - public function cookieUserName() { return $this->cookie_user_name; } - public function cookiePassword() { return $this->cookie_password; } - public function cookieLoginName() { return $this->cookie_login_name; } - public function cookieSecure() { return $this->cookie_security; } + public function emailSupport() { if ($this->applied) return $this->email_support; } + public function emailSystem() { if ($this->applied) return $this-email_system; } + public function cookieUserKey() { if ($this->applied) return $this->cookie_user_key; } + + public function cookieUserName() { if ($this->applied) return $this->cookie_user_name; } + public function cookiePassword() { if ($this->applied) return $this->cookie_password; } + public function cookieLoginName() { if ($this->applied) return $this->cookie_login_name; } + public function cookieSecure() { if ($this->applied) return $this->cookie_security; } public function limitUserNameMin() { return $this->limit_username_min; } public function limitUserNameMax() { return $this->limit_username_max; } @@ -93,13 +126,14 @@ public function systemBrand( ) { return $this->system_brand; } public function systemVersion() { return $this->system_version; } - public function siteName() { return $this->site_name; } - public function siteLanguage() { return $this->site_language; } - public function siteTimezone(){ return $this->site_timezone; } - - public function pathGenerated() { return $this->path_generated; } - public function pathGenerationCache() { return $this->path_generation_cache; } - public function pathRosCMS() { return $this->path_roscms; } + public function siteName() { if ($this->applied) return $this->site_name; } + public function siteLanguage() { if ($this->applied) return $this->site_language; } + public function siteTimezone(){ if ($this->applied) return $this->site_timezone; } + + public function pathGenerated() { if ($this->applied) return $this->path_generated; } + public function pathGenerationCache() { if ($this->applied) return $this->path_generation_cache; } + public function pathRosCMS() { if ($this->applied) return $this->path_roscms; } + public function pathInstance() { if ($this->applied) return $this->path_instance; } @@ -107,61 +141,66 @@ * setter functions */ public function setEmailSupport( $new_value ){ - $this->email_support = $new_value; + $this->config['email_support'] = $new_value; } public function setEmailSystem( $new_value ) { - $this->email_system = $new_value; + $this->config['email_system'] = $new_value; } public function setCookieUserKey( $new_value ) { - if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->cookie_user_key = $new_value; + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_user_key'] = $new_value; else die('bad user key cookie name'); } public function setCookieUserName( $new_value ) { - if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->cookie_user_name = $new_value; + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_user_name'] = $new_value; else die('bad user name cookie name'); } public function setCookiePassword( $new_value ) { - if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->cookie_password = $new_value; + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_password'] = $new_value; else die('bad password cookie name'); } public function setCookieLoginName( $new_value ) { - if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->cookie_login_name = $new_value; + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_login_name'] = $new_value; else die('bad login name cookie name'); } public function setCookieSecure( $new_value ) { - if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->cookie_security = $new_value; + if (preg_match('/[A-Za-z0-9_]+/', $new_value)) $this->config['cookie_security'] = $new_value; else die('bad security login cookie name'); } public function setSiteName( $new_value ) { - $this->site_name = $new_value; + $this->config['site_name'] = $new_value; } public function setSiteLanguage( $new_value ) { - $this->site_language = $new_value; + $this->config['site_language'] = $new_value; } public function setSiteTimezone( $new_value ) { - $this->site_timezone = intval($new_value); + $this->config['site_timezone'] = intval($new_value); } public function setPathGenerated( $new_value ) { - $this->path_generated = $new_value; + $this->config['path_generated'] = $new_value; } public function setPathGenerationCache( $new_value ) { - $this->path_generation_cache = $new_value; + $this->config['path_generation_cache'] = $new_value; } public function setPathRosCMS( $new_value ) { - $this->path_roscms = $new_value; - } + $this->config['path_roscms'] = $new_value; + } + + public function setPathInstance( $new_value ) { + $this->config['path_instance'] = $new_value; + } + } // end of RosCMS Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_ACL.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_ACL.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_ACL.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -67,7 +67,7 @@ // access rights in head foreach ($rights as $right) { - echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; + echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; } echo '</tr>'; @@ -253,7 +253,7 @@ // list rights in table head foreach ($rights as $right) { - echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; + echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; } echo '</tr>'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_Groups.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_Groups.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_Groups.class… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -74,7 +74,7 @@ // list rights in header foreach ($rights as $right) { - echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; + echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; } echo '</tr>'; @@ -300,7 +300,7 @@ <tr> <th>ACL Name</th>'); foreach ($rights as $right) { - echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; + echo '<th style="vertical-align:bottom;" title="'.$right['name'].': '.$right['description'].'"><img src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&type=vtext&text='.$right['name'].'" alt="'.$right['name'].'" /></th>'; } echo '</tr>'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_System.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_System.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Admin_System.class… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -93,7 +93,7 @@ // show areas in head foreach ($areas as $area) { - echo '<th style="vertical-align:bottom;" title="'.$area['name'].': '.$area['description'].'"><img src="?page=presentation&type=vtext&text='.$area['name'].'" alt="'.$area['name'].'" /></th>'; + echo '<th style="vertical-align:bottom;" title="'.$area['name'].': '.$area['description'].'"><img src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&type=vtext&text='.$area['name'].'" alt="'.$area['name'].'" /></th>'; } echo '</tr>'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SmartFilte… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SmartFilte… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_SmartFilte… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -121,7 +121,7 @@ echo_strip(' <span style="cursor:pointer; text-decoration:underline;" onclick="'."selectUserFilter('".$filter['setting']."', '".$filter['name']."')".'">'.$filter['name'].'</span> <span style="cursor:pointer;" onclick="'."deleteUserFilter('".$filter['id']."', '".$filter['name']."')".'"> - <img src="images/remove.gif" alt="-" style="width:11px; height:11px; border:0px;" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="-" style="width:11px; height:11px; border:0px;" /> </span> <br />'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_User.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_User.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_User.class… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -280,7 +280,7 @@ echo_strip('   <span class="frmeditbutton" onclick="'."delMembership(".$_GET['user'].", '".$membership['group_id']."')".'"> - <img src="images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" />  Delete </span>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -304,7 +304,7 @@ else { echo_strip(' <button type="button" id="bsavedraft" disabled="disabled">Save as Draft</button>   - <img src="images/locked.gif" width="11" height="12" /> (not enough rights)   + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/locked.gif" width="11" height="12" /> (not enough rights)   <input name="editautosavemode" type="hidden" value="false" />'); } @@ -325,7 +325,7 @@ echo_strip(' <span id="bshowdiff" class="frmeditbutton" onclick="'."openOrCloseDiffArea(".$this->rev_id.",".$this->rev_id.")".'"> - <img id="bshowdiffi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Compare</span> (no related '.$lang.' entry, choose yourself) '); + <img id="bshowdiffi" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Compare</span> (no related '.$lang.' entry, choose yourself) '); } // Compare button @@ -357,7 +357,7 @@ echo_strip(' <span id="bshowdiff" class="frmeditbutton" onclick="'."openOrCloseDiffArea('".$diff1."','".$diff2."')".'"> - <img id="bshowdiffi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> + <img id="bshowdiffi" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" />  Compare </span>'); } @@ -392,7 +392,7 @@ <div style="padding-bottom: 3px;"> <span class="revDetail"> <span onclick="'."toggleBookmark(".$revision['id'].", ".$thisuser->id().", 'editstar')".'" style="cursor: pointer;"> - <img id="editstar" class="'.Tag::getId($revision['id'], 'star', $thisuser->id()).'" src="images/star_'.Tag::getValue($revision['id'], 'star', $thisuser->id()).'_small.gif" alt="" style="width:13px; height:13px; border:0px;" alt="*" /> + <img id="editstar" class="'.Tag::getId($revision['id'], 'star', $thisuser->id()).'" src="'.RosCMS::getInstance()->pathRosCMS().'images/star_'.Tag::getValue($revision['id'], 'star', $thisuser->id()).'_small.gif" alt="" style="width:13px; height:13px; border:0px;" alt="*" /> </span>  '.$revision['name'].'</span>   @@ -411,7 +411,7 @@ echo_strip(' <span id="frmedittags" class="frmeditbutton" onclick="TabOpenClose(this.id)" style="white-space: nowrap;"> - <img id="frmedittagsi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> + <img id="frmedittagsi" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" />  Details </span> </div> @@ -578,7 +578,7 @@ if (($thisuser->hasAccess('system_tags') && $tag['user_id'] == -1) || $tag['user_id'] == $thisuser->id()) { echo_strip('   <span class="frmeditbutton" onclick="'."delLabelOrTag('".$tag['id']."')".'"> - <img src="images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" />  Delete </span>'); } @@ -703,7 +703,7 @@ // delete manual depency if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { - echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; } echo '</li>'; @@ -720,7 +720,7 @@ // delete manual depency if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { - echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/remove.gif" alt="" /> Delete</span>'; } echo '</li>'; @@ -790,7 +790,7 @@ <div>'.$data['id'].'</div><br /> <label for="secdataname">Name</label><br /> <input type="text" name="secdataname" id="secdataname" size="25" maxlength="100" value="'.$data['name'].'" /> (ASCII lowercase, no space) - <img src="images/attention.gif" width="22" height="22" /><br /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/attention.gif" width="22" height="22" /><br /> <small>all links to this entry will be updated</small><br /> <br /> <label for="cbmdatatype">Type</label><br /> @@ -813,7 +813,7 @@ } echo_strip(' </select> - <img src="images/attention.gif" width="22" height="22" /><br /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/attention.gif" width="22" height="22" /><br /> <br /> <br /> <button type="button" id="beditsavefields" onclick="'."saveSecurityData('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   @@ -852,7 +852,7 @@ <div id="editaddstext"></div> <span id="editaddstextcount" style="display: none;">'.$stext_num.'</span> <span class="filterbutton" onclick="addShortTextField()"> - <img src="images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add </span> <br /><br /> <h3>Text</h3>'); @@ -878,7 +878,7 @@ <div id="editaddtext"></div> <span id="editaddtextcount" style="display: none;">'.$text_num.'</span> <span class="filterbutton" onclick="addTextField()"> - <img src="images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add </span> <br /><br /><br /> <button type="button" id="beditsavefields" onclick="'."saveFieldData('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   @@ -919,15 +919,15 @@ <br /> <label for="verusr">User</label> <input type="text" name="verusr" id="verusr" size="20" maxlength="20" value="'.$revision['user_name'].'" /> (account name) - <img src="images/attention.gif" width="22" height="22" /><br /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/attention.gif" width="22" height="22" /><br /> <br /> <label for="verdate">Date</label> <input type="text" name="verdate" id="verdate" size="10" maxlength="10" value="'.$revision['date'].'" /> (year-month-day) - <img src="images/attention.gif" width="22" height="22" /><br /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/attention.gif" width="22" height="22" /><br /> <br /> <label for="vertime">Time</label> <input type="text" name="vertime" id="vertime" size="8" maxlength="8" value="'.$revision['time'].'" /> (hour:minute:second) - <img src="images/attention.gif" width="22" height="22" /><br /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/attention.gif" width="22" height="22" /><br /> <br /> <br /> <button type="button" id="beditsaveentry" onclick="saveRevisionData('.$this->data_id.','.$this->rev_id.')">Save Changes</button>   Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Login.class.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -110,7 +110,7 @@ if (0 == $user_id && $login_type == self::REQUIRED) { // build login url - $url = $config->pathRosCMS().'?page=login'; + $url = $config->pathInstance().'?page=login'; if ($target != '') { $url .= '&target='.urlencode($target); } @@ -159,7 +159,7 @@ } // otherwise redirect to myRosCMS page - header('Location: '.$config->pathRosCMS().'?page=my'); + header('Location: '.$config->pathInstance().'?page=my'); exit; } // end of member function out Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -87,7 +87,7 @@ <p><a href="javascript:generateAllPages()">Generate All Pages</a></p> <div id="maintainarea" style="border: 1px dashed red;display:none;"></div> - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /> + <img id="ajaxloading" style="display:none;" src="'.RosCMS::getInstance()->pathRosCMS().'images/ajax_loading.gif" width="13" height="13" alt="" /> <br />'); if (ThisUser::getInstance()->hasAccess('logs')) { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_User.class.p… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -68,7 +68,7 @@ <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getUser()" /><label for="searchopt3">email address</label> <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getUser()" /><label for="searchopt4">website</label>'.($thisuser->hasAccess('more_lang') ? ' <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getUser()" /><label for="searchopt5">language</label>' : '').' - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> + <img id="ajaxloading" style="display:none;" src="'.RosCMS::getInstance()->pathRosCMS().'images/ajax_loading.gif" width="13" height="13" alt="" /><br /> </fieldset> <br /> <div id="userarea"></div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -101,7 +101,7 @@ var roscms_standard_language = '".Language::getStandardId()."'; var roscms_intern_login_check_username = '".$thisuser->name()."'; var roscms_intern_webserver_roscms = '".RosCMS::getInstance()->pathRosCMS()."'; - var roscms_intern_page_link = '".RosCMS::getInstance()->pathRosCMS()."?page='; + var roscms_intern_page_link = '".RosCMS::getInstance()->pathInstance()."?page='; var roscms_get_edit = '".(isset($_GET['edit']) ? $_GET['edit'] : '')."'; // access restrictions @@ -197,7 +197,7 @@ <div id="smenutab9" class="submb" onclick="loadMenu(this.id)"> <div class="subm1"> - <div id="smenutabc9" class="subm2">Bookmark <img src="images/star_on_small.gif" alt="" style="width:13px; height:13px; border:0px;" /></div> + <div id="smenutabc9" class="subm2">Bookmark <img src="'.RosCMS::getInstance()->pathRosCMS().'images/star_on_small.gif" alt="" style="width:13px; height:13px; border:0px;" /></div> </div> </div> <div id="smenutab10" class="submb" onclick="loadMenu(this.id)"> @@ -221,11 +221,11 @@ <div class="corner_TR"></div> </div> <div class="title" id="labtitel1" onclick="TabOpenCloseEx(this.id)"> - <img id="labtitel1i" src="images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Quick Info + <img id="labtitel1i" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Quick Info </div> <div class="content" id="labtitel1c" style="display:block;"> <div id="qiload" style="display:none;"> - <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> </div> <div id="lablinks1" class="text"> <span>Move the mouse over an item to get some details</span> @@ -241,7 +241,7 @@ <div class="corner_TR"></div> </div> <div class="title" id="labtitel2" onclick="TabOpenCloseEx(this.id)"> - <img id="labtitel2i" src="images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Smart Filters + <img id="labtitel2i" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Smart Filters </div> <div class="content" id="labtitel2c"> </div> <div class="corner_BL"> @@ -254,7 +254,7 @@ <div class="corner_TR"></div> </div> <div class="title" id="labtitel3" onclick="TabOpenCloseEx(this.id)"> - <img id="labtitel3i" src="images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Labels + <img id="labtitel3i" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_open.gif" alt="" style="width:11px; height:11px; border:0px;" /> Labels </div> <div class="content" id="labtitel3c"> </div> <div class="corner_BL"> @@ -272,14 +272,14 @@ <div id="frametable" style="border: 0px dashed white;"> <div class="filterbar"> <input id="txtfind" type="text" accesskey="f" tabindex="1" title="Search & Filters" onfocus="'."searchFilter(this.id, this.value, 'Search & Filters', true)".'" onblur="'."searchFilter(this.id, this.value, 'Search & Filters', false)".'" onkeyup="getAllActiveFilters()" value="Search & Filters" size="39" maxlength="250" />  - <span id="filters" class="filterbutton" onclick="TabOpenClose(this.id)"><img id="filtersi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Filters</span>  + <span id="filters" class="filterbutton" onclick="TabOpenClose(this.id)"><img id="filtersi" src="'.RosCMS::getInstance()->pathRosCMS().'images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Filters</span>  <div id="filtersc" style="display:none;"> <div id="filtersct"> </div> <div id="filterOptionsfilt2" class="filterbar2"> - <span class="filterbutton" onclick="addFilter()"><img src="images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add</span> -    <span class="filterbutton" onclick="clearAllFilter()"><img src="images/clear.gif" alt="" style="width:14px; height:14px; border:0px;" /> Clear</span> -    <span class="filterbutton" onclick="'."addUserFilter('filter', filtstring2)".'"><img src="images/save.gif" alt="" style="width:14px; height:14px; border:0px;" /> Save</span> -    <span class="filterbutton" onclick="searchByFilters()"><img src="images/search.gif" alt="" style="width:14px; height:14px; border:0px;" /> Search</span> + <span class="filterbutton" onclick="addFilter()"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/add.gif" alt="" style="width:11px; height:11px; border:0px;" /> Add</span> +    <span class="filterbutton" onclick="clearAllFilter()"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/clear.gif" alt="" style="width:14px; height:14px; border:0px;" /> Clear</span> +    <span class="filterbutton" onclick="'."addUserFilter('filter', filtstring2)".'"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/save.gif" alt="" style="width:14px; height:14px; border:0px;" /> Save</span> +    <span class="filterbutton" onclick="searchByFilters()"><img src="'.RosCMS::getInstance()->pathRosCMS().'images/search.gif" alt="" style="width:14px; height:14px; border:0px;" /> Search</span> </div> </div> </div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Activate.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Activate.cl… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Activate.cl… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -53,9 +53,9 @@ echo_strip(' <h1>Activate '.RosCMS::getInstance()->siteName().' Account</h1> - <p>Already a member? <a href="'.RosCMS::getInstance()->pathRosCMS().'?page=login">Login now</a>!</p> - <p>Don\'t have a '.RosCMS::getInstance()->siteName().' account yet? <a href="'.RosCMS::getInstance()->pathRosCMS().'?page=register">Join now</a>, it\'s free and just takes a minute.</p> - <form action="'.RosCMS::getInstance()->pathRosCMS().'?page=login&subpage=activate" method="post"> + <p>Already a member? <a href="'.RosCMS::getInstance()->pathInstance().'?page=login">Login now</a>!</p> + <p>Don\'t have a '.RosCMS::getInstance()->siteName().' account yet? <a href="'.RosCMS::getInstance()->pathInstance().'?page=register">Join now</a>, it\'s free and just takes a minute.</p> + <form action="'.RosCMS::getInstance()->pathInstance().'?page=login&subpage=activate" method="post"> <div class="bubble"> <div class="corner_TL"> <div class="corner_TR"></div> @@ -103,7 +103,7 @@ echo_strip(' <h2>Account activated</h2> - <div><a href="'.RosCMS::getInstance()->pathRosCMS().'?page=login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); + <div><a href="'.RosCMS::getInstance()->pathInstance().'?page=login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); } elseif ($activation_code_exists) { echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -203,7 +203,7 @@ exit; } - header('Location: '.$config->pathRosCMS().'?page=my'); + header('Location: '.$config->pathInstance().'?page=my'); exit; } } // end of member function body @@ -237,9 +237,9 @@ } echo_strip(' - <form action="'.$config->pathRosCMS().'?page=login" method="post"> + <form action="'.$config->pathInstance().'?page=login" method="post"> <h1>Login</h1> - <p>You don\'t have a '.$config->siteName().' account yet? <a href="'.$config->pathRosCMS().'?page=register">Join now</a>, it\'s free and just takes a minute.</p> + <p>You don\'t have a '.$config->siteName().' account yet? <a href="'.$config->pathInstance().'?page=register">Join now</a>, it\'s free and just takes a minute.</p> <div class="bubble"> <div class="corner_TL"> @@ -305,15 +305,15 @@ echo '<div style="margin:10px;text-align:center;">'; if (empty($_GET['sec']) || $_GET['sec'] == 'standard') { - echo '<a href="'.$config->pathRosCMS().'?page=login&sec=security'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use enhanced security</a>'; + echo '<a href="'.$config->pathInstance().'?page=login&sec=security'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use enhanced security</a>'; } else { - echo '<a href="'.$config->pathRosCMS().'?page=login&sec=standard'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use standard security</a>'; + echo '<a href="'.$config->pathInstance().'?page=login&sec=standard'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use standard security</a>'; } echo_strip(' <br /> - <a href="'.$config->pathRosCMS().'?page=login&subpage=lost">Lost username or password?</a> + <a href="'.$config->pathInstance().'?page=login&subpage=lost">Lost username or password?</a> </div> </form>'); } // end of member function loginForm Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_LostPasswor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_LostPasswor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_LostPasswor… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -59,17 +59,17 @@ if (strlen($activation_code > 6)) { echo_strip(' - <h1><a href="'.$config->pathRosCMS().'?page=login">Login</a> > Reset your Password</h1> + <h1><a href="'.$config->pathInstance().'?page=login">Login</a> > Reset your Password</h1> <p>Have you forgotten your password of your '.$config->siteName().' account? Don\'t panic. You have already requested us that we reset your password. Now it\'s your turn to enter a new password for your '.$config->siteName().' account.</p>'); } else { echo_strip(' - <h1><a href="'.$config->pathRosCMS().'?page=login">Login</a> > Lost Username or Password?</h1> + <h1><a href="'.$config->pathInstance().'?page=login">Login</a> > Lost Username or Password?</h1> <p>Have you forgotten your username and/or password of your '.$config->siteName().' account? Don\'t panic. We can send you your username and let you reset your password. All you need is your email address.</p>'); } echo_strip(' - <form action="'.$config->pathRosCMS().'?page=login&subpage=lost" method="post"> + <form action="'.$config->pathInstance().'?page=login&subpage=lost" method="post"> <div class="bubble"> <div class="corner_TL"> <div class="corner_TR"></div> @@ -98,7 +98,7 @@ echo_strip(' <h2>Password changed</h2> - <div><a href="'.$config->pathRosCMS().'?page=login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); + <div><a href="'.$config->pathInstance().'?page=login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); } elseif (strlen($activation_code) < 6 && isset($_POST['registerpost']) && !empty($_POST['useremail']) && EMail::isValid($_POST['useremail']) && !empty($_POST['usercaptcha']) && !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && $mail_exists) { @@ -121,7 +121,7 @@ $subject = $config->siteName().' - Lost username or password?'; // Email message - $message = $config->siteName()." - Lost username or password?\n\n\nYou have requested your ".$config->siteName()." account login data.\n\nYou haven't requested your account login data? Oops, then someone has tried the 'Lost username or password?' function with your email address, just ignore this email.\n\n\nUsername: ".$user['name']."\n\n\nLost your password? Reset your password: ".$config->pathRosCMS()."?page=login&subpage=lost&code=".$activation_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $config->siteName()." - Lost username or password?\n\n\nYou have requested your ".$config->siteName()." account login data.\n\nYou haven't requested your account login data? Oops, then someone has tried the 'Lost username or password?' function with your email address, just ignore this email.\n\n\nUsername: ".$user['name']."\n\n\nLost your password? Reset your password: ".$config->pathInstance()."?page=login&subpage=lost&code=".$activation_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the Email if (EMail::send($_POST['useremail'], $subject, $message)) { @@ -189,14 +189,14 @@ function CaptchaReload() { ++BypassCacheNumber; - document.getElementById('captcha').src = '".$config->pathRosCMS()."?page=captcha&nr=' + BypassCacheNumber; + document.getElementById('captcha').src = '".$config->pathInstance()."?page=captcha&nr=' + BypassCacheNumber; } document.write('".'<br /><span style="color:#817A71;">If you can\'t read this, try <a href="javascript:CaptchaReload()">another one</a>.</span>'."'); -->".' </script>'; echo_strip(' - <img id="captcha" src="'.$config->pathRosCMS().'?page=captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$config->emailSupport().' for help." title="Are you human?" /> + <img id="captcha" src="'.$config->pathInstance().'?page=captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$config->emailSupport().' for help." title="Are you human?" /> <br />'); if (isset($_POST['registerpost'])) { @@ -210,7 +210,7 @@ <div class="field"> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> <button type="submit" name="submit">Send</button> - <button type="button" onclick="'."window.location=".$config->pathRosCMS()."'".'" style="color:#777777;">Cancel</button> + <button type="button" onclick="'."window.location=".$config->pathInstance()."'".'" style="color:#777777;">Cancel</button> </div>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Profile.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Profile.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Profile.cla… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -76,9 +76,9 @@ // more than one user was found (or none) if ($users_found != 1 && (empty($_GET['user_name']) || !empty($_GET['search']))) { echo_strip(' - <h1><a href="'.$config->pathRosCMS().'?page=my">'.$config->siteName().'</a> > Profile Search</h1> + <h1><a href="'.$config->pathInstance().'?page=my">'.$config->siteName().'</a> > Profile Search</h1> <p>Profile Search</p> - <form id="form1" method="get" action="'.$config->pathRosCMS().'?page=search"> + <form id="form1" method="get" action="'.$config->pathInstance().'?page=search"> <div class="bubble"> <div class="corner_TL"> <div class="corner_TR"></div> @@ -108,7 +108,7 @@ $stmt->execute(); while ($search = $stmt->fetch(PDO::FETCH_ASSOC)) { - echo '<li><a style="font-weight:bold;" href="'.$config->pathRosCMS().'?page=search&user_id='.$search['id'].'">'.$search['name'].'</a>'; + echo '<li><a style="font-weight:bold;" href="'.$config->pathInstance().'?page=search&user_id='.$search['id'].'">'.$search['name'].'</a>'; if ($search['fullname']) { echo '<br />'.$search['fullname']; } @@ -258,12 +258,12 @@ // show edit or search link (depending if the current user is searched user) if ($profile['id'] == $thisuser->id()) { - echo '<div class="u-link"><a href="'.$config->pathRosCMS().'?page=my&subpage=edit">Edit My Profile</a></div>'; + echo '<div class="u-link"><a href="'.$config->pathInstance().'?page=my&subpage=edit">Edit My Profile</a></div>'; } else { echo_strip(' <div class="u-link"> - <a href="'.$config->pathRosCMS().'?page=search">raquo; Profile Search</a> + <a href="'.$config->pathInstance().'?page=search">raquo; Profile Search</a> </div>'); } echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_ProfileEdit… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_ProfileEdit… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_ProfileEdit… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -57,17 +57,17 @@ if ($activation_code != '' && strlen($activation_code) > 6) { echo_strip(' - <h1><a href="'.$config->pathRosCMS().'?page=my">'.$config->siteName().'</a> > <a href="'.$config->pathRosCMS().'?page=my&subpage=edit">Edit My Profile</a> > Activate E-Mail Address</h1> + <h1><a href="'.$config->pathInstance().'?page=my">'.$config->siteName().'</a> > <a href="'.$config->pathInstance().'?page=my&subpage=edit">Edit My Profile</a> > Activate E-Mail Address</h1> <p>So you have a new email address and would like to keep your '.$config->siteName().' account up-to-date? That is a very good idea. To confirm your email address change, please enter your new email address again.</p>'); } else { echo_strip(' - <h1><a href="'.$config->pathRosCMS().'?page=my">'.$config->siteName().'</a> > Edit My Profile</h1> + <h1><a href="'.$config->pathInstance().'?page=my">'.$config->siteName().'</a> > Edit My Profile</h1> <p>Update your user account profile data to reflect the current state.</p>'); } echo_strip(' - <form action="'.$config->pathRosCMS().'?page=my&subpage=edit" method="post"> + <form action="'.$config->pathInstance().'?page=my&subpage=edit" method="post"> <div class="bubble"> <div class="corner_TL"> <div class="corner_TR"></div> @@ -90,7 +90,7 @@ echo_strip(' <h2>E-Mail Address Changed</h2> <div> - <a href="'.$config->pathRosCMS().'?page=my" style="color: red !important; text-decoration:underline;">My Profile</a> + <a href="'.$config->pathInstance().'?page=my" style="color: red !important; text-decoration:underline;">My Profile</a> </div>'); return; } @@ -167,7 +167,7 @@ $subject = $config->siteName()." - Email Address Activation"; // message - $message = $config->siteName()." - Email Address Activation\n\n\nYou have requested an email address change for your account on ".$config->siteName().". The next step in order to enable the new email address for the account is to activate it by using the hyperlink below.\n\n\nCurrent E-Mail Address: ".$profile['email']."\nNew E-Mail Address: ".$_POST['useremail']."\n\nActivation-Hyperlink: ".$config->pathRosCMS()."?page=my&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $config->siteName()." - Email Address Activation\n\n\nYou have requested an email address change for your account on ".$config->siteName().". The next step in order to enable the new email address for the account is to activate it by using the hyperlink below.\n\n\nCurrent E-Mail Address: ".$profile['email']."\nNew E-Mail Address: ".$_POST['useremail']."\n\nActivation-Hyperlink: ".$config->pathInstance()."?page=my&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the mail if (EMail::send($_POST['useremail'], $subject, $message)) { @@ -182,7 +182,7 @@ echo '<div>Password changed.</div>'; } - echo '<div><a href="'.$config->pathRosCMS().'?page=my" style="color:red !important; text-decoration:underline;">My Profile</a></div>'; + echo '<div><a href="'.$config->pathInstance().'?page=my" style="color:red !important; text-decoration:underline;">My Profile</a></div>'; ROSUser::syncSubsystems($profile['id']); } @@ -245,7 +245,7 @@ if (isset($_POST['registerpost']) && $existemail && $_POST['useremail'] != $profile['user_email']) { echo_strip(' <br /> - <em>That email address is already with an account. Do you have several accounts? Please <a href="'.$config->pathRosCMS().'?page=login" style="color:red !important; text-decoration:underline;"><strong>login</strong></a>!</em>'); + <em>That email address is already with an account. Do you have several accounts? Please <a href="'.$config->pathInstance().'?page=login" style="color:red !important; text-decoration:underline;"><strong>login</strong></a>!</em>'); } echo_strip(' @@ -346,7 +346,7 @@ <div class="field"> <input type="hidden" name="registerpost" id="registerpost" value="reg" /> <button type="submit" name="submit">Save</button> - <button type="button" onclick="'.("window.location='".$config->pathRosCMS()."'").'" style="color:#777777;">Cancel</button> + <button type="button" onclick="'.("window.location='".$config->pathInstance()."'").'" style="color:#777777;">Cancel</button> </div>'); } echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Register.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Register.cl… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Register.cl… [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -59,11 +59,11 @@ <h1>Register to'. $config->siteName().'</h1> <p>Become a member of the '.$config->siteName().' Community, and have a single sign-on for all '.$config->siteName().' web services.</p> <ul> - <li>Already a member? <a href="'.$config->pathRosCMS().'?page=login">Login now</a>! </li> - <li><a href="'.$config->pathRosCMS().'?page=login&subpage=lost">Lost username or password?</a></li> + <li>Already a member? <a href="'.$config->pathInstance().'?page=login">Login now</a>! </li> + <li><a href="'.$config->pathInstance().'?page=login&subpage=lost">Lost username or password?</a></li> </ul> - <form action="'.$config->pathRosCMS().'?page=register" method="post"> + <form action="'.$config->pathInstance().'?page=register" method="post"> <div class="bubble"> <div class="corner_TL"> <div class="corner_TR"></div> @@ -141,7 +141,7 @@ $subject = $config->siteName()." - Account Activation"; // message - $message = $config->siteName()." - Account Activation\n\n\nYou have registered an account on ".$config->siteName().". The next step in order to enable the account is to activate it by using the hyperlink below.\n\nYou haven't registered an account? Oops, then someone has tried to register an account with your email address. Just ignore this email, no one can use it anyway as it is not activated and the account will get deleted soon.\n\n\nUsername: ".$_POST['username']."\nPassword: ".$_POST['userpwd1']."\n\nActivation-Hyperlink: ".$config->pathRosCMS()."?page=login&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $config->siteName()." - Account Activation\n\n\nYou have registered an account on ".$config->siteName().". The next step in order to enable the account is to activate it by using the hyperlink below.\n\nYou haven't registered an account? Oops, then someone has tried to register an account with your email address. Just ignore this email, no one can use it anyway as it is not activated and the account will get deleted soon.\n\n\nUsername: ".$_POST['username']."\nPassword: ".$_POST['userpwd1']."\n\nActivation-Hyperlink: ".$config->pathInstance()."?page=login&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$config->siteName()." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the mail if (Email::send($_POST['useremail'], $subject, $message)) { @@ -200,7 +200,7 @@ if (isset($_POST['registerpost']) && $mail_exists) { echo_strip(' <br /> - <em>That email address is already with an account. Please <a href="'.$config->pathRosCMS().'?page=login" style="color:red !important; font-weight: bold; text-decoration:underline;">login</a>!</em>'); + <em>That email address is already with an account. Please <a href="'.$config->pathInstance().'?page=login" style="color:red !important; font-weight: bold; text-decoration:underline;">login</a>!</em>'); } echo_strip(' @@ -216,14 +216,14 @@ function CaptchaReload() { ++BypassCacheNumber; - document.getElementById('captcha').src = '".$config->pathRosCMS()."?page=captcha&nr=' + BypassCacheNumber; + document.getElementById('captcha').src = '".$config->pathInstance()."?page=captcha&nr=' + BypassCacheNumber; } document.write('<br /><span style=\"color:#817A71; \">If you can't read this, try <a href=\"javascript:CaptchaReload()\">another one</a>.</span>'); -->";echo_strip(' </script> - <img id="captcha" src="'.$config->pathRosCMS().'?page=captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$config->emailSupport().' for help." title="Are you human?" /> + <img id="captcha" src="'.$config->pathInstance().'?page=captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$config->emailSupport().' for help." title="Are you human?" /> <br />'); if (isset($_POST['registerpost'])) { echo_strip(' @@ -236,7 +236,7 @@ <div class="field"> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> <button type="submit" name="submit">Register</button> - <button type="button" onclick="'."window.location='".$config->pathRosCMS()."'".'" style="color:#777777;">Cancel</button> + <button type="button" onclick="'."window.location='".$config->pathInstance()."'".'" style="color:#777777;">Cancel</button> </div>'); } // end registration form Added: branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php [iso-8859-1] Thu Feb 12 15:11:12 2009 @@ -1,0 +1,72 @@ +<?php + /* + RosCMS Instance Example + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + 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 use RosCMS Instances: + ========================== + 1. you need to copy this file to another folder, where the instance + shall be located. + 2. rename this file to 'index.php' + 3. set ROSCMS_PATH, this is a path to the original RosCMS folder + 4. apply your special instance config data in the area below, you are + allowed to modify all settings to your needs. everything what is + not set in this config, is inherited from original RosCMS + +*/ + +// ROSCMS PATH +define('ROSCMS_PATH', '../roscms/'); + +// do not modify +require_once(ROSCMS_PATH.'lib/RosCMS.class.php'); +$config = &RosCMS::getInstance(); + +/////////////////////////////////////////////////////// +// Config start /////////////////////////////////////// + +$config->setCookieUserKey('roscmsusrkey'); // session key +$config->setCookieUserName('roscmsusrname'); // user_name +$config->setCookiePassword('rospassword'); // user_password (used for keep login function) +$config->setCookieLoginName('roscmslogon'); // where username is stored for 'save username' in login options +$config->setCookieSecure('roscmsseckey'); // stores security settings + +$config->setSiteName('foundation.ReactOS.org'); // sites name + +$config->setPathInstance('/reactos/roscms_instance/'); // path to roscms files +$config->setPathGenerationCache('../roscms_cache/'); // path to generated files (relative to roscms folder) +$config->setPathGenerated('../'); // path to generated files (relative to roscms folder) + + +// RosCMS Table Names +$config->setTable('ROSCMST_ENTRIES' , 'roscms_entries'); +$config->setTable('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); +$config->setTable('ROSCMST_STEXT' , 'roscms_entries_stext'); +$config->setTable('ROSCMST_TAGS' , 'roscms_entries_tags'); +$config->setTable('ROSCMST_TEXT' , 'roscms_entries_text'); + +// Config end ///////////////////////////////////////// +/////////////////////////////////////////////////////// + +// do not modify +$config->apply(); +include_once(ROSCMS_PATH.'index.php'); +exit; + +?>

1 0

[janderwald] 39573: - Define interface for wdmaud.drv - Needs review
by janderwald＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: janderwald Date: Thu Feb 12 14:13:19 2009 New Revision: 39573 URL: http://svn.reactos.org/svn/reactos?rev=39573&view=rev Log: - Define interface for wdmaud.drv - Needs review Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h (with props) Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h (added) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Thu Feb 12 14:13:19 2009 @@ -1,0 +1,178 @@ +#ifndef INTERFACE_H__ +#define INTERFACE_H__ + +/// +/// WDMAUD Interface Definition +/// +/// History: 12/02/2008 Created + + +typedef enum +{ + DEVICE_TYPE_NONE = 0, + DEVICE_TYPE_WAVE_OUT, + DEVICE_TYPE_WAVE_IN, + DEVICE_TYPE_MIDI_IN, + DEVICE_TYPE_MIDI_OUT, + DEVICE_TYPE_AUX_IN, + DEVICE_TYPE_AUX_OUT + +}AUDIO_DEVICE_TYPE; + +typedef struct +{ + AUDIO_DEVICE_TYPE DeviceType; + ULONG DeviceIndex; + + HANDLE hDevice; + ULONG DeviceCount; + KSSTATE State; + ULONG Volume; + + ULONG BufferSize; + PUCHAR Buffer; + + union + { + WAVEFORMATEX WaveFormatEx; + WAVEOUTCAPS WaveOutCaps; + AUXCAPS AuxCaps; + WAVEINCAPS WaveInCaps; + }u; + +}WDMAUD_DEVICE_INFO; + + + +/// IOCTL_OPEN_WDMAUD +/// +/// Description: This IOCTL informs wdmaud that an application whats to use wdmsys for a waveOut / waveIn / aux operation +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: DeviceType identifies the device type, DeviceIndex the index, WaveFormatEx the device details +/// Result: is returned in hDevice +/// Return Code: STATUS_SUCCESS indicates success, otherwise appropiate error code +/// Prequsites: none + +#define IOCTL_OPEN_WDMAUD CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 0, METHOD_BUFFERED); + + +/// IOCTL_CLOSE_WDMAUD +/// +/// Description: This IOCTL informs that an application has finished with wdmsys and closes the connection +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: DeviceType, DeviceIndex and hDevice must be set +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: openend device + +#define IOCTL_CLOSE_WDMAUD CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 1, METHOD_BUFFERED); + + +/// IOCTL_GETNUMDEVS_TYPE +/// +/// Description: This IOCTL queries the number of devices currently present of a specific type. The caller passes a WDMAUD_DEVICE_INFO structure. +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType contains the requested device type. +/// Result: The result is returned in DeviceCount +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: none + +#define IOCTL_GETNUMDEVS_TYPE CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 2, METHOD_BUFFERED); + + + +/// IOCTL_SETDEVICE_STATE +/// +/// Description: This IOCTL sets an opened waveOut / waveIn / midiIn / midiOut / aux device to specific state +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType, DeviceIndex, hDevice and State member must be set. State determines the new state +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + +#define IOCTL_SETDEVICE_STATE CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 3, METHOD_BUFFERED); + + +/// IOCTL_GETDEVID +/// +/// Description: This IOCTL returns the device index by its provided handle +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType and hDevice must be set +/// Result: The result is returned in DeviceIndex +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + + +#define IOCTL_GETDEVID CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 4, METHOD_BUFFERED); + + + +/// IOCTL_GETVOLUME +/// +/// Description: This IOCTL returns the volume a device +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType and hDevice must be set +/// Result: The result is returned in Volume +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + + +#define IOCTL_GETVOLUME CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 5, METHOD_BUFFERED); + + +/// IOCTL_SETVOLUME +/// +/// Description: This IOCTL sets the volume a device +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType, hDevice and Volume must be set +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + + +#define IOCTL_SETVOLUME CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 6, METHOD_BUFFERED); + + +/// IOCTL_GETCAPABILTIES +/// +/// Description: This IOCTL retrieves the capabilties of an specific device +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType and DeviceIndex must be set +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: none + + +#define IOCTL_GETCAPABILTIES CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 7, METHOD_BUFFERED); + + +/// IOCTL_WRITEDATA +/// +/// Description: This IOCTL writes data to specified device +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The DeviceType, DeviceIndex, hDevice, BufferSize and Buffer must be set +/// ReturnCode: STATUS_SUCCESS indicates success +/// Prequsites: opened device + + +#define IOCTL_WRITEDATA CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 8, METHOD_BUFFERED); + + + + + +#endif Propchange: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Thu Feb 12 14:13:19 2009 @@ -3,8 +3,63 @@ #include <ntddk.h> #include <portcls.h> +#include <ks.h> #define YDEBUG #include <debug.h> +#include <ksmedia.h> + + +#ifndef MAXPNAMELEN +#define MAXPNAMELEN 32 +#endif + +#ifndef WAVEOUTCAPS + +typedef struct +{ + USHORT wMid; + USHORT wPid; + ULONG vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + ULONG dwFormats; + USHORT wChannels; + USHORT wReserved1; + ULONG dwSupport; +} WAVEOUTCAPS; + +#endif + +#ifndef AUXCAPS + +typedef struct { + USHORT wMid; + USHORT wPid; + ULONG vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + USHORT wTechnology; + USHORT wReserved1; + ULONG dwSupport; +} AUXCAPS; + +#endif + +#ifndef WAVEINCAPS + +typedef struct +{ + USHORT wMid; + USHORT wPid; + ULONG vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + ULONG dwFormats; + USHORT wChannels; + USHORT wReserved1; +} WAVEINCAPS; +#endif + + + +#include "interface.h" typedef struct { @@ -13,7 +68,6 @@ UNICODE_STRING SymbolicLink; PFILE_OBJECT FileObject; }SYSAUDIO_ENTRY; - typedef struct { @@ -27,12 +81,4 @@ - - - - - - - - #endif

1 0

[dgoette] 39572: * fix adding of new entries * hackfix login dialog * allow manual adding of depencies * fix generator
by dgoette＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dgoette Date: Thu Feb 12 12:54:30 2009 New Revision: 39572 URL: http://svn.reactos.org/svn/reactos?rev=39572&view=rev Log: * fix adding of new entries * hackfix login dialog * allow manual adding of depencies * fix generator Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/connect.db.php branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -43,8 +43,9 @@ $config->setSiteLanguage('en'); // standard language $config->setSiteTimezone(-2); // time difference to utc time from server time -$config->setPathGenerated('/reactos/'); // path to generated files $config->setPathRoscms('/reactos/roscms/'); // path to roscms files +$config->setPathGenerationCache('../roscms_cache/'); // path to generated files (relative to roscms folder) +$config->setPathGenerated('../'); // path to generated files (relative to roscms folder) Modified: branches/danny-web/reactos.org/htdocs/roscms/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -21,10 +21,10 @@ // Database: $db_host = 'localhost'; -$db_user = 'lev-db'; -$db_pass = 'DangerGround'; -$db_name = 'realroscms'; -$db_port = 3306; +$db_user = 'username'; +$db_pass = 'password'; +$db_name = 'roscms'; +$db_port = 3301; // vars are unset in DBConnection class // !!! so be sure to use DBConnection or unset(..) yourself Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -113,6 +113,7 @@ child_id bigint(20) unsigned default NULL COMMENT '->entries(id)', child_name varchar(80) collate utf8_unicode_ci default NULL, include tinyint(1) NOT NULL default '0', + user_defined tinyint(1) NOT NULL default '0', PRIMARY KEY (id), KEY rev_id (rev_id), KEY child_id (child_id), @@ -129,6 +130,7 @@ name varchar(100) collate utf8_unicode_ci NOT NULL, name_short varchar(50) collate utf8_unicode_ci NOT NULL, description varchar(255) collate utf8_unicode_ci NOT NULL, + standard tinyint(1) NOT NULL default '0', PRIMARY KEY (id), UNIQUE KEY name (name), UNIQUE KEY name_short (name_short) @@ -139,10 +141,12 @@ NULL, sec_fullname, sec_name, - sec_description + sec_description, + FALSE FROM data_security ORDER BY sec_name; +UPDATE roscms_entries_access SET standard=TRUE WHERE name_short='default'; -- -------------------------------------------------------- @@ -271,7 +275,8 @@ (34, 'show admin filter', 'admin_filter', 'special admin filters'), (35, 'Show all filter', 'dont_hide_filter', 'don''t hide filter from users'), (36, 'Make Entries Stable', 'make_stable', 'Make Entries Stable'), -(37, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); +(37, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''), +(38, 'Add manuel depencies', 'add_depencies', 'add new manuell depencies to entries'); @@ -290,7 +295,7 @@ WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group' OR a.name_short = 'more_filter' OR a.name_short = 'make_stable' OR a.name_short = 'dont_hide_filter') AND g.security_level > 1) -OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter') +OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter' OR a.name_short = 'add_depencies') AND g.security_level = 3) OR ((a.name_short = 'admin' OR a.name_short = 'logs' OR a.name_short = 'addlvl3group') @@ -721,6 +726,7 @@ DROP old_archive, ADD UNIQUE KEY type_name ( type , name ); ALTER TABLE roscms_entries_revisions DROP old_id; +ALTER TABLE roscms_entries_access DROP name_short; Modified: branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -120,3 +120,6 @@ #legend .lbox { border: solid 1px black; width: 17px;} + +.deletebutton { cursor:pointer; color:#006090; font-weight: bold; } + Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -1951,6 +1951,11 @@ alertbox('Entry updated'); break; + case 'updatedepencies': + alertbox(http_request.responseText); + makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdepencies&d_r_id='+document.getElementById('mefrrevid').innerHTML, 'mef', 'frmedittagsc2', 'html', 'GET', ''); + break; + case 'updatetag': selectUserTags(); objid = tsplits[1]; @@ -2322,7 +2327,7 @@ // new dynamic entry case 1: - makeRequest('?page=backend&type=text&subtype=ned&action=newdynamic&name='+encodeURIComponent(document.getElementById('txtadddynsource').value), 'ned', 'newentryarea', 'html', 'GET', ''); + makeRequest('?page=backend&type=text&subtype=ned&action=newdynamic&data_id='+encodeURIComponent(document.getElementById('txtadddynsource').value), 'ned', 'newentryarea', 'html', 'GET', ''); break; // new page & content (with template) @@ -2374,6 +2379,35 @@ document.getElementById('previewzone').innerHTML = http_request.responseText; document.getElementById('previewhead').innerHTML = '<span class="button" onclick="loadEntryTableWithOffset(roscms_current_tbl_position)"><strong>« Back</strong></span>   <strong>Preview</strong>'; } // end of function showPreview + + + +/** + * add a new manual depency + * + * @param int rev_id + */ +function addDepency( rev_id ) +{ + var name = document.getElementById('dep_name').value; + + // check if name is given + if (name != '') { + makeRequest('?page=backend&type=text&subtype=mef&d_fl=adddepency&rev_id='+rev_id+'&dep_name='+encodeURIComponent(name)+'&dep_type='+encodeURIComponent(document.getElementById('dep_type').value), 'mef', 'updatedepencies', 'html', 'GET', ''); + } +} // addDepency + + + +/** + * delete a new manual depency + * + * @param int dep_id depency id + */ +function deleteDepency( dep_id ) +{ + makeRequest('?page=backend&type=text&subtype=mef&d_fl=deletedepency&dep_id='+dep_id, 'mef', 'updatedepencies', 'html', 'GET', ''); +} // deleteDepency Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -37,7 +37,7 @@ */ public function __construct() { - global $db_host, $db_host, $db_user, $db_pass; + global $db_host, $db_host, $db_user, $db_pass, $db_port; include_once(ROSCMS_PATH.'connect.db.php'); try { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -44,7 +44,8 @@ private $site_language = 'en'; // standard language private $site_timezone = -2; // time difference to utc time from server time - private $path_generated = '/reactos/'; // path to generated files + private $path_generated = '../reactos/'; // path to generated files + private $path_generation_cache = '../reactos/roscms_cache'; // path to cache files while generation process private $path_roscms = '/reactos/roscms/'; // path to roscms files // system vars @@ -97,6 +98,7 @@ public function siteTimezone(){ return $this->site_timezone; } public function pathGenerated() { return $this->path_generated; } + public function pathGenerationCache() { return $this->path_generation_cache; } public function pathRosCMS() { return $this->path_roscms; } @@ -152,6 +154,11 @@ public function setPathGenerated( $new_value ) { $this->path_generated = $new_value; } + + public function setPathGenerationCache( $new_value ) { + $this->path_generation_cache = $new_value; + } + public function setPathRosCMS( $new_value ) { $this->path_roscms = $new_value; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -65,7 +65,7 @@ * * @access private */ - private function evalAction( ) + private function evalAction( ) { switch ($_GET['action']) { @@ -77,7 +77,22 @@ // dynamic entry - save entry case 'newdynamic': - $rev_id = Entry::add($_GET['name'], 'content', null, true); + + // get some data about the dynamic page + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id AS rev_id, d.name FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE d.id=:data_id AND lang_id=:standard_lang LIMIT 1"); + $stmt->bindParam('data_id',$_GET['data_id'],PDO::PARAM_INT); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->execute(); + $page = $stmt->fetchOnce(PDO::FETCH_ASSOC); + $next_index = Tag::getValue($page['rev_id'],'next_index',-1); + + // create new dynamic entry + $rev_id = Entry::add($page['name'].'_'.$next_index, 'content'); + + // update next index for dynamic page + Tag::update(Tag::getId($page['rev_id'],'next_index',-1),$next_index+1); + + // show editor new Backend_ViewEditor($rev_id); break; @@ -106,7 +121,7 @@ break; } // end switch type break; - + } // end switch action } // end of member function evalAction Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -112,6 +112,26 @@ // show Depencies case 'showdepencies': $this->showEntryDetails(self::DEPENCIES); + break; + + // add Depencies + case 'adddepency': + if (Depencies::addManual($_GET['rev_id'],$_GET['dep_name'],$_GET['dep_type'])) { + echo 'Adding user defined depency was successful.'; + } + else { + echo 'Error while adding user defined depency.'; + } + break; + + // delete Depencies + case 'deletedepency': + if (Depencies::deleteManual($_GET['dep_id'])) { + echo 'Deleting user defined depency was successful.'; + } + else { + echo 'Error while deleting user defined depency.'; + } break; // show Field details @@ -376,6 +396,7 @@ </span>  '.$revision['name'].'</span>   + <span style="display: none;" id="mefrrevid">'.$revision['id'].'</span> <span style="white-space: nowrap;">type: <span class="revDetail">'.$revision['type'].'</span></span>   <span style="white-space: nowrap;">version: <span id="mefrverid" class="revDetail">'.$revision['version'].'</span></span>   <span style="white-space: nowrap;">language: <span class="revDetail">'.$revision['language'].'</span><span id="mefrlang" style="display:none;">'.$revision['lang_id'].'</span></span>   @@ -635,18 +656,38 @@ */ private function showEntryDepencies() { + + // add manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + echo_strip(' + <h3>Add Depency</h3> + <fieldset> + <label for="dep_name">Name:</label> + <input type="text" name="dep_name" id="dep_name" /><br /> + + <label for="dep_type">Type:</label> + <select name="dep_type" id ="dep_type"> + <option value="content">Content</option> + <option value="script">Script</option> + <option value="template">Template</option> + '.(ThisUser::getInstance()->hasAccess('dynamic_pages') ? '<option value="dynamic">Dynamic Page</option>' : '').' + </select><br /> + <button type="submit" onclick="'."addDepency(".$this->rev_id.")".'">add manual depency</button> + </fieldset>'); + } + // print depency tree echo '<h3>Dependent Entries</h3>'; $this->buildDepencyTree($this->data_id); // required articles that don't exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include FROM ".ROSCMST_DEPENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include, id, user_defined FROM ".ROSCMST_DEPENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_fail = $stmt->fetchAll(PDO::FETCH_ASSOC); // articles that exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include, w.id, w.user_defined FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_exist = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -658,17 +699,31 @@ if (count($required_exist) > 0) { echo '<ul>'; foreach($required_exist as $required) { - echo '<li>'.$required['name'].' ['.$required['type'].'] ('.($required['include']==true ? 'include' : 'link').')</li>'; + echo '<li>['.$required['type'].'] '.$required['name'].' ('.($required['include']==true ? 'include' : 'link').')'; + + // delete manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + } + + echo '</li>'; } echo '</ul>'; } if (count($required_fail) > 0) { echo_strip(' - <h4>Entries that don\'t exist</h4> + <h4>Required Entries that don\'t exist</h4> <ul>'); foreach($required_fail as $required) { - echo '<li>'.$required['child_name'].' ('.($required['include']==true ? 'include' : 'link').')</li>'; + echo '<li>'.$required['child_name'].' ('.($required['include']==true ? 'include' : 'link').')'; + + // delete manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + } + + echo '</li>'; } echo '</ul>'; } @@ -685,7 +740,7 @@ private function buildDepencyTree( $data_id ) { // get current childs - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id, w.user_defined, w.id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); $stmt->bindParam('data_id',$data_id, PDO::PARAM_INT); $stmt->execute(); $depencies = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -695,15 +750,19 @@ if (count($depencies) > 0) { echo '<ul>'; - $last_language = null; // show Depencies + $x=0; foreach ($depencies as $depency) { - echo '<li>'.$depency['name'].' ('.$depency['type'].') ['.$depency['language'].']'; + $x++; + echo '<li style="color: #'.($x%2 ? '000' : '777').';">['.$depency['type'].'] '.$depency['name'].' <span style="color: #'.($x%2 ? 'AAA' : 'CCC').';">('.$depency['language'].')</span>'; + + // get childs if ($data_id != $depency['data_id']) { $this->buildDepencyTree( $depency['data_id']); } echo '</li>'; - } + } // end foreach + echo '</ul>'; } elseif ($this->data_id === $data_id) { @@ -1008,7 +1067,14 @@ { // select all related entries if ($lang_id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 ORDER BY l.name ASC, r.datetime DESC"); + if (ThisUser::getInstance()->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 ORDER BY l.name ASC, r.datetime DESC"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 AND l.id IN(:standard_lang,:lang_id) ORDER BY l.name ASC, r.datetime DESC"); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->bindParam('lang_id',ThisUser::getInstance()->language(),PDO::PARAM_INT); + } } // select only one language Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -46,7 +46,7 @@ @set_time_limit(0); // remove old depencies - DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES); + DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES." WHERE user_defined IS FALSE"); // walk trough all stable $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE archive IS FALSE AND status='stable'"); @@ -146,6 +146,48 @@ /** + * add a new user defined depency + * + * @param int rev_id + * @param string name entry name + * @param string type entry type + * @return bool + * @access public + */ + public static function addManual( $rev_id, $name, $type ) + { + // check access rights + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + return self::insert($rev_id, $name, $type, true); + } + return false; + } // end of member function addManual + + + + /** + * deletes a user defined Depency + * + * @param int dep_id depency id + * @return bool + * @access public + */ + public static function deleteManual( $dep_id ) + { + // check access rights + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + + // delete depencies + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE id = :dep_id AND user_defined IS TRUE"); + $stmt->bindParam('dep_id',$dep_id,PDO::PARAM_INT); + return $stmt->execute(); + } + return false; + } // end of member function deleteManual + + + + /** * inserts/updates new depency into database * * @param string[] matches @@ -158,36 +200,73 @@ switch ($matches[2]) { case 'templ': $type = 'template'; - $include = true; break; case 'cont': $type = 'content'; - $include = true; break; case 'inc': $type = 'script'; - $include = true; break; case 'link': $type = 'page'; + break; + } + + return self::insert($this->rev_id, $matches[3], $type, false); + } // end of member function newDepency + + + + /** + * shared function to insert/update entries + * + * @param int rev_id parent + * @param string name child + * @param string type child + * @param bool user_defined + * @return bool + * @access public + */ + private static function insert( $rev_id, $name, $type, $user_defined ) + { + // is include depency ? + switch ($type) { + case 'template': + $depency_name = 'templ_'.$name; + $include = true; + break; + case 'content': + $depency_name = 'cont_'.$name; + $include = true; + break; + case 'script': + $depency_name = 'inc_'.$name; + $include = true; + break; + case 'dynamic': + $depency_name = 'link_'.$name; + $include = true && $user_defined; + break; + case 'page': + $depency_name = 'link_'.$name; $include = false; break; } - // try to get depency id + // check for existing entry $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ENTRIES." WHERE name = :name AND type = :type LIMIT 1"); - $stmt->bindParam('name',$matches[3],PDO::PARAM_STR); + $stmt->bindParam('name',$name,PDO::PARAM_STR); $stmt->bindParam('type',$type,PDO::PARAM_STR); if ($stmt->execute()) { $data_id = $stmt->fetchColumn(); // check if we already have an depency to this entry $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_DEPENCIES." WHERE child_name=:depency_name"); - $stmt->bindParam('depency_name',$matches[1],PDO::PARAM_STR); + $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); $stmt->execute(); $depency_id = $stmt->fetchColumn(); - // update depency with name -> depency with id + // update entry with data id instead of name&type if ($depency_id !== false) { $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_DEPENCIES." SET child_name=NULL, child_id=:depency_id WHERE id=:depency_id"); $stmt->bindParam('child_id',$data_id,PDO::PARAM_INT); @@ -195,27 +274,28 @@ return $stmt->execute(); } - // inseert new depency + // insert new depency else { // insert depency with name if ($data_id === false) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include) VALUES (:rev_id, :depency_name, :is_include)"); - $stmt->bindParam('depency_name',$matches[1],PDO::PARAM_STR); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include, user_defined) VALUES (:rev_id, :depency_name, :is_include, :user_defined)"); + $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); } // insert depency with id else { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include) VALUES (:rev_id, :depency_id, :is_include)"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include, user_defined) VALUES (:rev_id, :depency_id, :is_include, :user_defined)"); $stmt->bindParam('depency_id',$data_id,PDO::PARAM_INT); } - $stmt->bindParam('rev_id',$this->rev_id,PDO::PARAM_INT); + $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->bindParam('is_include',$include,PDO::PARAM_BOOL); + $stmt->bindParam('user_defined',$user_defined,PDO::PARAM_BOOL); return $stmt->execute(); } } return false; - } // end of member function newDepency + } // end of member function deleteManual Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -167,7 +167,7 @@ * @return bool * @access public */ - public static function add($data_name, $data_type = null, $template = '', $dynamic = false) + public static function add($data_name, $data_type = null, $template = '') { $data_name = trim($data_name); @@ -180,11 +180,16 @@ // if entry does not exist -> create a new one if ($data_id === false) { + + $stmt_ask=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS." WHERE standard IS TRUE"); + $stmt_ask->execute(); + $access_id = $stmt_ask->fetchColumn(); // insert new data - $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type ) VALUES ( NULL , :name, :type )"); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type , access_id ) VALUES ( NULL , :name, :type, :access_id )"); $stmt_ins->bindParam('name',$data_name,PDO::PARAM_STR); $stmt_ins->bindParam('type',$data_type,PDO::PARAM_STR); + $stmt_ins->bindParam('access_id',$access_id,PDO::PARAM_INT); $stmt_ins->execute(); // and get new data_id (use old used statement again) @@ -199,6 +204,7 @@ // only go on, if we got a new revision if ($rev_id === false) { + echo 'Could not create new revision, maybe the entry already exists.'; return false; } @@ -225,16 +231,6 @@ Tag::add($rev_id, 'next_number', 1, -1); } } - elseif ($data_type == 'content' && $dynamic === true) { - - // get highest saved dynamic number for this data - $next_number = intval(Tag::getValue($rev_id,'number_next',-1)); - - // add a title - $stmt->bindValue('description','title',PDO::PARAM_STR); - $stmt->bindValue('content',$data_name.'_'.$next_number,PDO::PARAM_STR); - $stmt->execute(); - } // set page content to template, if selected if ($template != '' && $template != 'none') { @@ -256,7 +252,7 @@ // add Tags Tag::add($rev_id, 'number', $next_number, -1); Tag::add($rev_id, 'pub_date', date('Y-m-d'), -1); - Tag::add($rev_id, 'pub_user', $thisuser->id(), -1); + Tag::add($rev_id, 'pub_user', ThisUser::getInstance()->id(), -1); // update next number Tag::update(Tag::getId($rev_id,'number_next',-1),$next_number+1); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -27,9 +27,8 @@ class Generate { - private $destination_folder = '../'; // distance between roscms folder to pages folder - private $cache_dir = '../roscms_cache/'; // cached files - private $base_dir = ''; + private $cache_dir; // cached files + private $base_dir; // where current things are generated into (may switch between normal generation and caching generation) // page related vars private $page_name; @@ -51,11 +50,15 @@ */ public function __construct( ) { + // setup paths for generating content and caching + $this->base_dir = ROSCMS_PATH.RosCMS::getInstance()->pathGenerated(); + $this->cache_dir = ROSCMS_PATH.RosCMS::getInstance()->pathGenerationCache(); + // set generation start time $this->begin = date('Y-m-d H:i:s'); // try to force a bigger script runtime (needed by some functions) - @set_time_limit(300); + @set_time_limit(0); } // end of constructor @@ -130,7 +133,7 @@ // build all entries if ($id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') ORDER BY l.level DESC, l.id ASC, d.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') ORDER BY l.level DESC, l.name ASC, d.name ASC"); } // build only the selected language @@ -141,14 +144,14 @@ // build only the selected page, in all languages elseif ($id_type === 'data') { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC, l.name ASC"); $stmt->bindParam('data_name',$ld,PDO::PARAM_STR); } // build only the revision elseif ($id_type === 'revision') { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC"); - $stmt->bindParam('data_name',$ld,PDO::PARAM_STR); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE (d.type = 'page' OR d.type = 'dynamic') AND r.id = :rev_id"); + $stmt->bindParam('rev_id',$ld,PDO::PARAM_STR); } $stmt->execute(); @@ -157,7 +160,7 @@ // display language if ($old_lang != $data['lang_id']) { - echo '<span style="text-decoration:underline;">'.$data['language'].'</span>'; + echo '<span style="text-decoration:underline;font-size:1.3em;">'.$data['language'].'</span><br />'; $old_lang = $data['lang_id']; $this->lang_id = $data['lang_id']; @@ -205,44 +208,38 @@ $file_name = $data_name.'.'.$file_extension; // information, what was generated - echo $this->lang_id.'--'.$file_name.'<br />'; - - // can I copy from standard lang? Otherwise we will write a new file - if (!$this->cloneFile(RosCMS::getInstance()->siteLanguage(),$this->lang, $file_name)) { - - // needed by replacing functions - $this->page_name = $data_name; - $this->rev_id = $revision['id']; - - // file content - $content = $revision['content']; - - // used by templates - $content = str_replace('[#%NAME%]', $data_name, $content); - - // replace depencies - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); - $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); - $stmt_more->execute(); - $depencies = $stmt_more->fetchAll(PDO::FETCH_ASSOC); - foreach ($depencies as $depency) { - - // replace - if ($depency['type'] != 'script') { - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); - } - } - - // execute scripts - $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); - - // replace roscms vars - $content = $this->replaceRoscmsPlaceholder($content); - - // write content to filename, if possible - return $this->writeFile($this->lang,$file_name, $content.''); - } - return false; + echo $file_name.'<br />'; + + // needed by replacing functions + $this->page_name = $data_name; + $this->rev_id = $revision['id']; + + // file content + $content = $revision['content']; + + // used by templates + $content = str_replace('[#%NAME%]', $data_name, $content); + + // replace depencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); + $stmt_more->execute(); + while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + + // replace + if ($depency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + } + } // end foreach + + // execute scripts + $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); + + // replace roscms vars + $content = $this->replaceRoscmsPlaceholder($content); + + // write content to filename, if possible + return $this->writeFile($this->lang,$file_name, $content.''); } // end of member function oneEntry @@ -290,29 +287,43 @@ // information, what was generated echo $this->lang_id.'--'.$file_name.'<br />'; - - // can I copy from standard lang ? - if (!$this->cloneFile(RosCMS::getInstance()->siteLanguage(), $this->lang, $file_name)) { - - // needed by replacing functions - $this->page_name = $data_name; - $this->rev_id = $revision['id']; - $this->dynamic_num = $i; - - // used by templates - $content = str_replace('[#%NAME%]', $data_name, $revision['content']); - - // replace depencies - $content = preg_replace_callback('/\[#((cont|templ)_[^][#[:space:]]+)\]/', array($this,'getCached'),$content); - $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); - - // replace roscms vars - $content = $this->replaceRoscmsPlaceholder($content); - - // write content to filename, if possible - $this->writeFile($this->lang,$file_name, $content.''); - } - } + + // get current instance (dynamic entry revision id) + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id, r.lang_id FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE d.type='content' AND d.name = CONCAT(:parent_name,'_',:dynamic_num) AND r.status='stable' AND r.archive IS FALSE LIMIT 1"); + $stmt->bindParam('parent_name',$revision['name'],PDO::PARAM_STR); + $stmt->bindParam('dynamic_num',$i,PDO::PARAM_INT); + $stmt->execute(); + $instance = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // needed by replacing functions + $this->page_name = $data_name; + $this->rev_id = $revision['id']; + $this->dynamic_num = $i; + + // used by templates + $content = str_replace('[#%NAME%]', $data_name, $revision['content']); + + // replace depencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + $stmt_more->bindParam('rev_id',$instance['id'],PDO::PARAM_INT); + $stmt_more->execute(); + while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + + // replace + if ($depency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + } + } // end foreach + + // replace scripts + $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); + + // replace roscms vars + $content = $this->replaceRoscmsPlaceholder($content); + + // write content to filename, if possible + $this->writeFile($this->lang,$file_name, $content.''); + } // end for } // end of member function makeDynamic @@ -339,7 +350,7 @@ $stmt->execute(); $revision=$stmt->fetchOnce(PDO::FETCH_ASSOC); - // cache revision (set language, cache, restore base_dir) + // cache revision (set language, cache) $this->lang_id = $revision['lang_id']; $this->cacheFiles($revision['data_id']); @@ -403,6 +414,7 @@ break; } // end switch } // end while depency + return true; } // end of member function update @@ -427,16 +439,17 @@ } if ($data_id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.type = 'content' OR d.type = 'script' OR d.type='template' ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.type = 'content' OR d.type = 'script' OR d.type='template' ORDER BY l.level DESC, l.name ASC"); } else { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.id=:data_id ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id AS data_id, type, name, :lang_id AS lang_id FROM ".ROSCMST_ENTRIES." WHERE id=:data_id"); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->bindParam('lang_id',$this->lang_id,PDO::PARAM_INT); } $stmt->execute(); // prepare for usage in loop - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); + $stmt_more=&DBConnection::getInstance()->prepare("SELECT w.child_id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -446,12 +459,11 @@ } $filename = $this->short[$data['type']].'_'.$data['name'].'.rcf'; - $file = $data['lang_id'].'/'.$filename; $revision = $this->getFrom($data['type'],$data['name']); - + // can I copy from standard language ? - if (!$this->cloneFile(Language::getStandardId(),$data['lang_id'], $filename)) { + if (!$this->cloneFile(Language::getStandardId(),$data['lang_id'], $filename, $revision['lang_id'])) { // generate file $this->rev_id = $revision['id']; @@ -478,14 +490,13 @@ // cache dependent entries first $depency_file = $data['lang_id'].'/'.$this->short[$depency['type']].'_'.$depency['name'].'.rcf'; if (!file_exists($this->cache_dir.$depency_file) || $this->begin > date('Y-m-d H:i:s',filemtime($this->cache_dir.$depency_file))) { - $this->cacheFiles($depency['id']); + $this->cacheFiles($depency['child_id']); } // replace - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + $content = '~'.$this->lang_id.'~'.str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); } } - $this->writeFile($data['lang_id'],$filename, $content); } } // end while @@ -493,6 +504,7 @@ // reset old build path if ($first == $data_id) { $this->base_dir = $backup; + $backup = null; } } // end of member function cacheFiles @@ -578,7 +590,9 @@ /** - * + * returns an array with revision information & text + * - if an localized version is available that one is returned + * - otherwise the standard language version * * @param string type * @param string name @@ -588,7 +602,7 @@ private function getFrom( $type, $name ) { // get entry - $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id, r.version, r.status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id = :lang_id AND r.archive IS FALSE AND t.name = 'content' AND status='stable' LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id = :lang_id AND r.archive IS FALSE AND t.name = 'content' AND status='stable' LIMIT 1"); $stmt->bindParam('name',$name,PDO::PARAM_STR); $stmt->bindParam('type',$type,PDO::PARAM_STR); $stmt->bindParam('lang_id',$this->lang_id,PDO::PARAM_INT); @@ -651,14 +665,17 @@ * This function tries to copy a file from the standard language folder to another language folder * * @param string source_folder + * @param string dest_folder + * @param string filename + * @param int content_lang * @return bool * @access private */ - private function cloneFile( $source_folder, $dest_folder, $filename ) + private function cloneFile( $source_folder, $dest_folder, $filename, $content_lang ) { // check, if language is different than standard and if requested file exists - if ($this->lang_id != Language::getStandardId() && file_exists($this->base_dir.$source_folder.'/'.$filename)) { - return copy($this->base_dir.$source_folder.'/'.$filename, $this->base_dir.$dest_folder.'/'.$filename); + if ($this->lang_id != Language::getStandardId() && $content_lang == Language::getStandardId() && file_exists($this->base_dir.$source_folder.'/'.$filename)) { + return @copy($this->base_dir.$source_folder.'/'.$filename, $this->base_dir.$dest_folder.'/'.$filename); } return false; } // end of member function cloneFile @@ -717,6 +734,9 @@ eval('?>'.$revision['content']); $content = ob_get_contents(); ob_end_clean(); + + // replace roscms links + $content = preg_replace_callback('/\[#link_([^][#[:space:]]+)\]/', array($this, 'replaceWithHyperlink'), $content); } // no other script types supported -> return nothing @@ -724,9 +744,6 @@ $content = $revision['content']; } - // replace roscms links - $content = preg_replace_callback('/\[#link_([^][#[:space:]]+)\]/', array($this, 'replaceWithHyperlink'), $content); - return $content; } // end of member function evalTemplate Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -28,6 +28,13 @@ class HTML_User_Login extends HTML_User { + + + private $err_message=null; + private $random_string_security=null; + + + /** * * @@ -36,6 +43,17 @@ public function __construct( ) { session_start(); + $this->checkLogin(); + + $config = &RosCMS::getInstance(); + + if (isset($_GET['sec']) && $_GET['sec'] == 'security') { + $this->random_string_security = $this->makeKey(); + Cookie::write($config->cookieSecure(), $this->random_string_security, 0); + } + else { + Cookie::write($config->cookieSecure(), '', time() - 3600); + } // register js files $this->register_js('md5.js'); @@ -44,21 +62,21 @@ - protected function body( ) + protected function checkLogin( ) { $config = &RosCMS::getInstance(); // show login dialog if (empty($_POST[$config->cookieUserName()]) && empty($_POST[$config->cookiePassword()])) { - self::loginPage(); + $this->loginPage(); } // pw or user are not set elseif(empty($_POST[$config->cookieUserName()])) { - self::loginPage('Please enter your username!'); + $this->loginPage('Please enter your username!'); } elseif(empty($_POST[$config->cookiePassword()])) { - self::loginPage('Please enter your password'); + $this->loginPage('Please enter your password'); } // try to login the user @@ -71,7 +89,7 @@ $session_found = true; } else { - $session_id = self::makeKey(); + $session_id = $this->makeKey(); $session_found = false; } @@ -80,7 +98,7 @@ $user_name = $matches[1]; } else { - self::loginPage('You have specified an incorrect username.'); + $this->loginPage('You have specified an incorrect username.'); exit; } @@ -89,7 +107,7 @@ $password = $matches[1]; } else { - self::loginPage('You have specified an invalid password.'); + $this->loginPage('You have specified an invalid password.'); exit; } @@ -110,13 +128,13 @@ } if ($a_password != $user['password']) { - self::loginPage("You have specified an incorrect or inactive username, or an invalid password."); + $this->loginPage("You have specified an incorrect or inactive username, or an invalid password."); exit; } // if the account is NOT enabled; e.g. a reason could be that a member of the admin group has disabled this account because of spamming, etc. if ($user['disabled'] == true) { - self::loginPage('Account is not activated or disabled!<br /><br />Check your email inbox (and spam folder), maybe you have overseen the activation information.'); + $this->loginPage('Account is not activated or disabled!<br /><br />Check your email inbox (and spam folder), maybe you have overseen the activation information.'); exit; } @@ -191,6 +209,7 @@ } // end of member function body + /** * shows page with login formular * @@ -198,18 +217,19 @@ */ private function loginPage( $err_message = '' ) { + $this->err_message = $err_message; + } + + + + /** + * shows page with login formular + * + * @access private + */ + protected function body( ) + { $config = &RosCMS::getInstance(); - - //@ADD comment -> why do we need this - $random_string_security = ''; - - if (isset($_GET['sec']) && $_GET['sec'] == 'security') { - $random_string_security = self::makeKey(); - Cookie::write($config->cookieSecure(), $random_string_security, 0); - } - else { - Cookie::write($config->cookieSecure(), '', time() - 3600); - } $target_clean = ''; if (isset($_REQUEST['target']) && preg_match('/^(\/[a-zA-Z0-9!$%&,\'()*+\-.\/:;=?@_~]+)$/', $_REQUEST['target'], $matches)) { @@ -262,20 +282,20 @@ } echo_strip(' <input name="logintype" type="hidden" id="logintype" value="'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? 'security' : 'standard').'" /> - <button type="submit" name="submit"'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? ' onclick="'.$config->cookiePassword().'.value = calcMD5(\''.$random_string_security.'\' + calcMD5('.$config->cookiePassword().'.value))"': '').'>Login</button> + <button type="submit" name="submit"'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? ' onclick="'.$config->cookiePassword().'.value = calcMD5(\''.$this->random_string_security.'\' + calcMD5('.$config->cookiePassword().'.value))"': '').'>Login</button> </div> <div class="corner_BL"> <div class="corner_BR"></div> </div> </div>'); - if ($err_message != "") { + if ($this->err_message != "") { echo_strip(' <div class="bubble message"> <div class="corner_TL"> <div class="corner_TR"></div> </div> - <strong>');echo $err_message;echo_strip('</strong> + <strong>');echo $this->err_message;echo_strip('</strong> <div class="corner_BL"> <div class="corner_BR"></div> </div>

1 0

[cwittich] 39571: -move FCB_TAG to header -use ExAllocatePoolWithTag / ExFreePoolWithTag -free the NameListResource when destroying an FCB -get rid of CdfsWriteNumberInShortName
by cwittich＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: cwittich Date: Thu Feb 12 12:52:12 2009 New Revision: 39571 URL: http://svn.reactos.org/svn/reactos?rev=39571&view=rev Log: -move FCB_TAG to header -use ExAllocatePoolWithTag / ExFreePoolWithTag -free the NameListResource when destroying an FCB -get rid of CdfsWriteNumberInShortName Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -232,6 +232,7 @@ #endif #define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_FCB TAG('I', 'F', 'C', 'B') typedef struct { Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -35,8 +35,6 @@ /* FUNCTIONS ****************************************************************/ -#define TAG_FCB TAG('I', 'F', 'C', 'B') - #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -114,10 +112,11 @@ { Entry = Fcb->ShortNameList.Flink; RemoveEntryList(Entry); - ExFreePool(Entry); - } - - ExFreePool(Fcb); + ExFreePoolWithTag(Entry, TAG_FCB); + } + + ExDeleteResourceLite(&Fcb->NameListResource); + ExFreePoolWithTag(Fcb, TAG_FCB); } Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -95,21 +95,6 @@ ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0); } -/* Writes a number into a string, ending at the target position. */ -static PWCHAR -CdfsWriteNumberInShortName -(PWCHAR EndOfNumberTarget, - ULONG Number) -{ - while (Number) - { - *EndOfNumberTarget = '0' + (Number % 10); - EndOfNumberTarget--; - Number /= 10; - } - return EndOfNumberTarget; -} - VOID CdfsShortNameCacheGet (PFCB DirectoryFcb, @@ -118,11 +103,9 @@ PUNICODE_STRING ShortName) { BOOLEAN HasSpaces; - PWCHAR LastDot, Scan; - ULONG Number = 1; PLIST_ENTRY Entry; PCDFS_SHORT_NAME ShortNameEntry; - GENERATE_NAME_CONTEXT Context = { }; + GENERATE_NAME_CONTEXT Context = { 0 }; DPRINT("CdfsShortNameCacheGet(%I64u,%wZ)\n", StreamOffset->QuadPart, LongName); @@ -165,13 +148,6 @@ DPRINT("Initial Guess %wZ\n", ShortName); - /* Find the part that'll be numberified */ - LastDot = &ShortName->Buffer[(ShortName->Length / sizeof(WCHAR)) - 1]; - for (Scan = ShortName->Buffer; - Scan - ShortName->Buffer < ShortName->Length; - Scan++) - if (*Scan == '.') LastDot = Scan - 1; - /* Make it unique by scanning the cache and bumping */ /* Note that incrementing the ambiguous name is enough, since we add new * entries at the tail. We'll scan over all collisions. */ @@ -186,14 +162,13 @@ &ShortNameEntry->Name, TRUE) == 0) /* Match */ { - Scan = CdfsWriteNumberInShortName(LastDot, ++Number); - *Scan = '~'; + RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); DPRINT("Collide; try %wZ\n", ShortName); } } /* We've scanned over all entries and now have a unique one. Cache it. */ - ShortNameEntry = ExAllocatePool(PagedPool, sizeof(CDFS_SHORT_NAME)); + ShortNameEntry = ExAllocatePoolWithTag(PagedPool, sizeof(CDFS_SHORT_NAME), TAG_FCB); if (!ShortNameEntry) { /* We couldn't cache it, but we can return it. We run the risk of

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009