Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 19286: - use Winefile command line for initial directory selection
by mf＠svn.reactos.com 16 Nov '05

16 Nov '05

- use Winefile command line for initial directory selection - remove useless hwndParent variable Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW --- trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-11-16 23:07:37 UTC (rev 19286) @@ -25,7 +25,7 @@ ifeq ($(UNICODE),1) CFLAGS += -DUNICODE -# LFLAGS+= -Wl,--entry,_wWinMain@16 +#LFLAGS += -Wl,--entry,_wWinMain@16 RCFLAGS += -DUNICODE endif _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-11-16 23:07:37 UTC (rev 19286) @@ -2146,9 +2146,7 @@ break; case WM_DESTROY: - /* don't exit desktop when closing file manager window */ - if (!Globals.hwndParent) - PostQuitMessage(0); + PostQuitMessage(0); break; case WM_INITMENUPOPUP: { @@ -4683,11 +4681,11 @@ } -static void show_frame(HWND hwndParent, int cmdshow) +static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { const static TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; - TCHAR path[MAX_PATH], b1[BUFFER_LEN]; + TCHAR buffer[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; @@ -4696,8 +4694,6 @@ if (Globals.hMainWnd) return; - Globals.hwndParent = hwndParent; - hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); @@ -4752,8 +4748,12 @@ Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ /*TODO: read paths and window placements from registry */ - GetCurrentDirectory(MAX_PATH, path); + if (!path || !*path) { + GetCurrentDirectory(MAX_PATH, buffer); + path = buffer; + } + ShowWindow(Globals.hMainWnd, cmdshow); //#if defined(_SHELL_FOLDERS) && !defined(__WINE__) @@ -4826,7 +4826,7 @@ #endif -static int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) +static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) { MSG msg; @@ -4836,7 +4836,7 @@ /*TODO: read window placement from registry */ cmdshow = SW_MAXIMIZE; - show_frame(hwndParent, cmdshow); + show_frame(0, cmdshow, path); while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg)) @@ -4855,17 +4855,26 @@ } -int APIENTRY WinMain(HINSTANCE hinstance, - HINSTANCE previnstance, - LPSTR cmdline, - int cmdshow) +#if defined(UNICODE) && defined(_MSC_VER) +int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) +#else +int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) +#endif { #ifdef _NO_EXTENSIONS if (find_window_class(sWINEFILEFRAME)) return 1; #endif - winefile_main(hinstance, 0, cmdshow); +#if defined(UNICODE) && !defined(_MSC_VER) + { /* convert ANSI cmdline into WCS path string */ + TCHAR buffer[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); + winefile_main(hinstance, cmdshow, buffer); + } +#else + winefile_main(hinstance, cmdshow, cmdline); +#endif return 0; } _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-11-16 23:07:37 UTC (rev 19286) @@ -118,7 +118,6 @@ HANDLE hInstance; HACCEL haccel; ATOM hframeClass; - HWND hwndParent; HWND hMainWnd; HMENU hMenuFrame;

1 0

[sedwards] 19285: no op header change. Correct some of the header guards to match the DDK
by sedwards＠svn.reactos.com 16 Nov '05

16 Nov '05

no op header change. Correct some of the header guards to match the DDK Modified: trunk/reactos/w32api/include/ddk/afilter.h Modified: trunk/reactos/w32api/include/ddk/atm.h Modified: trunk/reactos/w32api/include/ddk/cfg.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h Modified: trunk/reactos/w32api/include/ddk/d3dhal.h Modified: trunk/reactos/w32api/include/ddk/scsi.h Modified: trunk/reactos/w32api/include/ddk/xfilter.h _____ Modified: trunk/reactos/w32api/include/ddk/afilter.h --- trunk/reactos/w32api/include/ddk/afilter.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/afilter.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __AFILTER_H -#define __AFILTER_H +#ifndef _ARC_FILTER_DEFS_ +#define _ARC_FILTER_DEFS_ #if __GNUC__ >=3 #pragma GCC system_header @@ -186,4 +186,4 @@ } #endif -#endif /* __AFILTER_H */ +#endif /* _ARC_FILTER_DEFS_ */ _____ Modified: trunk/reactos/w32api/include/ddk/atm.h --- trunk/reactos/w32api/include/ddk/atm.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/atm.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __ATM_H -#define __ATM_H +#ifndef _ATM_H +#define _ATM_H #if __GNUC__ >=3 #pragma GCC system_header @@ -504,4 +504,4 @@ } #endif -#endif /* __ATM_H */ +#endif /* _ATM_H */ _____ Modified: trunk/reactos/w32api/include/ddk/cfg.h --- trunk/reactos/w32api/include/ddk/cfg.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/cfg.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __CFG_H -#define __CFG_H +#ifndef _CFG_INCLUDED_ +#define _CFG_INCLUDED_ #if __GNUC__ >=3 #pragma GCC system_header @@ -142,4 +142,4 @@ } #endif -#endif /* __CFG_H */ +#endif /* _CFG_INCLUDED_ */ _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __CFGMGR32_H -#define __CFGMGR32_H +#ifndef _CFGMGR32_H_ +#define _CFGMGR32_H_ #if __GNUC__ >=3 #pragma GCC system_header @@ -1876,4 +1876,4 @@ } #endif -#endif /* __CFGMGR32_H */ +#endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/w32api/include/ddk/d3dhal.h --- trunk/reactos/w32api/include/ddk/d3dhal.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/d3dhal.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE_D3DHAL_H -#define __WINE_D3DHAL_H +#ifndef _D3DHAL_H_ +#define _D3DHAL_H_ #ifdef __cplusplus extern "C" { @@ -522,4 +522,4 @@ } /* extern "C" */ #endif -#endif /* __WINE_DDRAWI_H */ +#endif /* _D3DHAL_H_ */ _____ Modified: trunk/reactos/w32api/include/ddk/scsi.h --- trunk/reactos/w32api/include/ddk/scsi.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/scsi.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __SCSI_H -#define __SCSI_H +#ifndef _NTSCSI_ +#define _NTSCSI_ #if __GNUC__ >=3 #pragma GCC system_header @@ -1692,4 +1692,4 @@ } #endif -#endif /* __SCSI_H */ +#endif /* _NTSCSI_ */ _____ Modified: trunk/reactos/w32api/include/ddk/xfilter.h --- trunk/reactos/w32api/include/ddk/xfilter.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/xfilter.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __XFILTER_H -#define __XFILTER_H +#ifndef _X_FILTER_DEFS_ +#define _X_FILTER_DEFS_ #if __GNUC__ >=3 #pragma GCC system_header @@ -233,4 +233,4 @@ } #endif -#endif /* __XFILTER_H */ +#endif /* _X_FILTER_DEFS_ */

1 0

[frik85] 19284: RosCMS (Part 6)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 6) Plain SQL file for RosCMS Added: trunk/web/reactos.org/sql/ Added: trunk/web/reactos.org/sql/roscms.sql _____ Added: trunk/web/reactos.org/sql/roscms.sql --- trunk/web/reactos.org/sql/roscms.sql 2005-11-16 21:44:26 UTC (rev 19283) +++ trunk/web/reactos.org/sql/roscms.sql 2005-11-16 21:55:42 UTC (rev 19284) @@ -0,0 +1,249 @@ +-- +-- RosCMS - ReactOS Content Management System +-- Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +-- +-- +-- Database: `roscms` +-- + +-- -------------------------------------------------------- + +-- +-- `content` +-- + +DROP TABLE IF EXISTS `content`; +CREATE TABLE `content` ( + `content_id` bigint(20) NOT NULL auto_increment, + `content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `content_text` text collate utf8_unicode_ci NOT NULL, + `content_version` int(11) NOT NULL default '0', + `content_active` tinyint(4) NOT NULL default '0', + `content_visible` tinyint(4) NOT NULL default '0', + `content_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `content_usrname_id` bigint(20) NOT NULL default '0', + `content_date` date NOT NULL default '0000-00-00', + `content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`content_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0; + +-- -------------------------------------------------------- + +-- +-- `dyn_content` +-- + +DROP TABLE IF EXISTS `dyn_content`; +CREATE TABLE `dyn_content` ( + `dyn_id` bigint(20) NOT NULL auto_increment, + `dyn_content_id` bigint(20) NOT NULL default '0', + `dyn_content_nr` int(11) NOT NULL default '0', + `dyn_content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `dyn_content_text1` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text2` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text3` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text4` longtext collate utf8_unicode_ci NOT NULL, + `dyn_content_version` int(11) NOT NULL default '0', + `dyn_content_active` tinyint(4) NOT NULL default '0', + `dyn_content_visible` tinyint(4) NOT NULL default '0', + `dyn_content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_usrname_id` bigint(20) NOT NULL default '0', + `dyn_content_date` date NOT NULL default '0000-00-00', + `dyn_content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`dyn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `include_text` +-- + +DROP TABLE IF EXISTS `include_text`; +CREATE TABLE `include_text` ( + `inc_id` bigint(20) NOT NULL auto_increment, + `inc_level` tinyint(4) NOT NULL default '0', + `inc_word` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `inc_text` text collate utf8_unicode_ci NOT NULL, + `inc_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `inc_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `inc_vis` tinyint(4) NOT NULL default '0', + `inc_seclevel` tinyint(4) NOT NULL default '50', + `inc_usrname_id` bigint(20) NOT NULL default '0', + `inc_date` date NOT NULL default '0000-00-00', + `inc_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`inc_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `languages` +-- + +DROP TABLE IF EXISTS `languages`; +CREATE TABLE `languages` ( + `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_level` int(11) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; + +-- -------------------------------------------------------- + +-- +-- `pages` +-- + +DROP TABLE IF EXISTS `pages`; +CREATE TABLE `pages` ( + `page_id` bigint(20) NOT NULL auto_increment, + `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_language` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `pages_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `page_text` text collate utf8_unicode_ci NOT NULL, + `page_version` int(11) NOT NULL default '0', + `page_active` tinyint(4) NOT NULL default '0', + `page_visible` tinyint(4) NOT NULL default '0', + `page_usrname_id` bigint(20) NOT NULL default '0', + `page_date` date NOT NULL default '0000-00-00', + `page_time` time NOT NULL default '00:00:00', + `page_generate_usrid` bigint(20) NOT NULL default '0', + `page_generate_timestamp` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`page_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `roscms_security_log` +-- + +DROP TABLE IF EXISTS `roscms_security_log`; +CREATE TABLE `roscms_security_log` ( + `roscms_sec_log_id` bigint(20) NOT NULL auto_increment, + `roscms_sec_log_section` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_priority` int(11) NOT NULL default '100', + `roscms_sec_log_reason` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_user` varchar(100) collate utf8_unicode_ci NOT NULL default 'roscms_system', + `roscms_sec_log_useraccount` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_userip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_referrer` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_text` text collate utf8_unicode_ci NOT NULL, + `roscms_sec_log_date` date NOT NULL default '0000-00-00', + `roscms_sec_log_time` time NOT NULL default '00:00:00', + `roscms_sec_log_visible` int(11) NOT NULL default '1', + PRIMARY KEY (`roscms_sec_log_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `subsys_mappings` +-- + +DROP TABLE IF EXISTS `subsys_mappings`; +CREATE TABLE `subsys_mappings` ( + `map_roscms_userid` bigint(20) NOT NULL default '0', + `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', + `map_subsys_userid` int(7) NOT NULL default '0', + PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `user_sessions` +-- + +DROP TABLE IF EXISTS `user_sessions`; +CREATE TABLE `user_sessions` ( + `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', + `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', + `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', + `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', + `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', + PRIMARY KEY (`usersession_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; + +-- -------------------------------------------------------- + +-- +-- `usergroup_members` +-- + +DROP TABLE IF EXISTS `usergroup_members`; +CREATE TABLE `usergroup_members` ( + `usergroupmember_userid` bigint(20) NOT NULL default '0', + `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `usergroups` +-- + +DROP TABLE IF EXISTS `usergroups`; +CREATE TABLE `usergroups` ( + `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', + `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`usrgroup_name_id`), + UNIQUE KEY `usrgroup_name` (`usrgroup_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `users` +-- + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `user_id` bigint(20) NOT NULL auto_increment, + `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `user_login_counter` bigint(20) NOT NULL default '0', + `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', + `user_register` timestamp NULL default NULL, + `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', + `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + PRIMARY KEY (`user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table' AUTO_INCREMENT=0 ; + + Property changes on: trunk/web/reactos.org/sql/roscms.sql ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[gvg] 19283: Add a bit of defensive programming
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Add a bit of defensive programming Modified: trunk/reactos/services/dhcp/adapter.c _____ Modified: trunk/reactos/services/dhcp/adapter.c --- trunk/reactos/services/dhcp/adapter.c 2005-11-16 21:43:38 UTC (rev 19282) +++ trunk/reactos/services/dhcp/adapter.c 2005-11-16 21:44:26 UTC (rev 19283) @@ -125,6 +125,7 @@ ( EnumKey, EnumKeysTop[i], "DriverDesc" ); if( DriverDesc && + RootDevice && !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) { TargetKeyName = malloc( strlen( TargetKeyNameStart ) +

1 0

[gvg] 19282: Give comdlg32.dll a little bit more space
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Give comdlg32.dll a little bit more space Modified: trunk/reactos/baseaddress.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-11-16 21:42:50 UTC (rev 19281) +++ trunk/reactos/baseaddress.xml 2005-11-16 21:43:38 UTC (rev 19282) @@ -65,8 +65,8 @@ <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> -<property name="BASEADDRESS_COMDLG32" value="0x76200000" /> -<property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> +<property name="BASEADDRESS_COMDLG32" value="0x76210000" /> +<property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" />

1 0

[gvg] 19281: SVN maintenance
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

SVN maintenance Property changes on: trunk/reactos/lib/dhcpcapi ___________________________________________________________________ Name: svn:ignore - temp.exp *.a *.dll *.lib *.sym *.coff *.map *.tmp *.o *.gch *.d + GNUmakefile Property changes on: trunk/reactos/subsys/system/gettype ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/reactos/subsys/system/sc ___________________________________________________________________ Name: svn:ignore + GNUmakefile

1 0

[frik85] 19280: RosCMS (Part 5)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 5) Added: trunk/web/reactos.org/htdocs/roscms/images/mail.gif Added: trunk/web/reactos.org/htdocs/roscms/images/notactive.gif Added: trunk/web/reactos.org/htdocs/roscms/images/notvisible.gif Added: trunk/web/reactos.org/htdocs/roscms/images/richtexteditor.gif Added: trunk/web/reactos.org/htdocs/roscms/images/rospc.gif Added: trunk/web/reactos.org/htdocs/roscms/images/tool.gif Added: trunk/web/reactos.org/htdocs/roscms/images/topbar.jpg Added: trunk/web/reactos.org/htdocs/roscms/images/userpic_default.jpg Added: trunk/web/reactos.org/htdocs/roscms/images/view.gif Added: trunk/web/reactos.org/htdocs/roscms/images/view2.gif Added: trunk/web/reactos.org/htdocs/roscms/images/visible.gif _____ Added: trunk/web/reactos.org/htdocs/roscms/images/mail.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/mail.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/notactive.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/notactive.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/notvisible.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/notvisible.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/richtexteditor.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/richtexteditor.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/rospc.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/rospc.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/tool.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/tool.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/topbar.jpg (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/topbar.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg _____ Added: trunk/web/reactos.org/htdocs/roscms/images/userpic_default.jpg (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/userpic_default.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg _____ Added: trunk/web/reactos.org/htdocs/roscms/images/view.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/view.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/view2.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/view2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/visible.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/visible.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[gvg] 19278: Wine-0_9_1 vendor drop
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Wine-0_9_1 vendor drop Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/hotkey.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/monthcal.c Modified: vendor/wine/dlls/comctl32/current/pager.c Modified: vendor/wine/dlls/comctl32/current/progress.c Modified: vendor/wine/dlls/comctl32/current/propsheet.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/status.c Modified: vendor/wine/dlls/comctl32/current/string.c Modified: vendor/wine/dlls/comctl32/current/syslink.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/tooltips.c Modified: vendor/wine/dlls/comctl32/current/trackbar.c Modified: vendor/wine/dlls/comctl32/current/treeview.c Modified: vendor/wine/dlls/comctl32/current/updown.c Modified: vendor/wine/dlls/commdlg/current/Makefile.in Modified: vendor/wine/dlls/commdlg/current/cdlg.h Modified: vendor/wine/dlls/commdlg/current/cdlg32.c Modified: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Cn.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fi.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fr.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_It.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Nl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_No.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Si.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sk.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sv.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Th.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Uk.rc Modified: vendor/wine/dlls/commdlg/current/colordlg.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/filetitle.c Modified: vendor/wine/dlls/commdlg/current/finddlg32.c Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/dinput/current/device.c Modified: vendor/wine/dlls/dinput/current/joystick_linuxinput.c Modified: vendor/wine/dlls/dinput/current/mouse.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/dsound_private.h Modified: vendor/wine/dlls/dsound/current/duplex.c Modified: vendor/wine/dlls/dsound/current/mixer.c Modified: vendor/wine/dlls/mpr/current/mpr.rc Modified: vendor/wine/dlls/mpr/current/mpr_Cs.rc Added: vendor/wine/dlls/mpr/current/mpr_Ko.rc Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/appsearch.c Modified: vendor/wine/dlls/msi/current/classes.c Modified: vendor/wine/dlls/msi/current/cond.y Modified: vendor/wine/dlls/msi/current/create.c Modified: vendor/wine/dlls/msi/current/custom.c Modified: vendor/wine/dlls/msi/current/database.c Modified: vendor/wine/dlls/msi/current/delete.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/distinct.c Modified: vendor/wine/dlls/msi/current/files.c Modified: vendor/wine/dlls/msi/current/format.c Modified: vendor/wine/dlls/msi/current/helpers.c Modified: vendor/wine/dlls/msi/current/insert.c Modified: vendor/wine/dlls/msi/current/install.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.rc Modified: vendor/wine/dlls/msi/current/msi.spec Added: vendor/wine/dlls/msi/current/msi_Ko.rc Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/order.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/record.c Modified: vendor/wine/dlls/msi/current/registry.c Modified: vendor/wine/dlls/msi/current/select.c Modified: vendor/wine/dlls/msi/current/string.c Modified: vendor/wine/dlls/msi/current/suminfo.c Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msi/current/update.c Modified: vendor/wine/dlls/msi/current/where.c Modified: vendor/wine/dlls/ole32/current/antimoniker.c Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/memlockbytes16.c Modified: vendor/wine/dlls/ole32/current/ole16.c Modified: vendor/wine/dlls/ole32/current/ole2.c [truncated at 100 lines; 77 more skipped] _____ Modified: vendor/wine/dlls/comctl32/current/animate.c --- vendor/wine/dlls/comctl32/current/animate.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/animate.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -899,6 +899,7 @@ case WM_TIMER: return ANIMATE_Timer(infoPtr); + case WM_PRINTCLIENT: case WM_PAINT: { /* the animation isn't playing, or has not decompressed _____ Modified: vendor/wine/dlls/comctl32/current/comboex.c --- vendor/wine/dlls/comctl32/current/comboex.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/comboex.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -1395,7 +1395,7 @@ if (!item) { item = get_item_data(infoPtr, dis->itemID); if (item == (CBE_ITEMDATA *)CB_ERR) { - ERR("invalid item for id %d \n", dis->itemID); + ERR("invalid item for id %d\n", dis->itemID); return 0; } } _____ Modified: vendor/wine/dlls/comctl32/current/datetime.c --- vendor/wine/dlls/comctl32/current/datetime.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/datetime.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -1284,6 +1284,7 @@ case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; + case WM_PRINTCLIENT: case WM_PAINT: return DATETIME_Paint (infoPtr, (HDC)wParam); _____ Modified: vendor/wine/dlls/comctl32/current/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/header.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -598,10 +598,99 @@ nmitem.iImage = infoPtr->items[iItem].iImage; return (BOOL)SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); + (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); } +/** + * Send Disp Info notification. + * depends on NMHDDISPINFOW having same structure as NMHDDISPINFOA + * (so we handle the two cases only doing a specific cast for pszText). + * + * @param hwnd : hwnd header container handler + * @param mask : notification mask (usually HDI_TEXT or HDI_IMAGE) + * @param pDispInfo : NMHDDISPINFO structure (can be unicode or ansi) + * @param isW : TRUE if dispinfo is Unicode + */ +static BOOL +HEADER_SendHeaderDispInfoNotify(HWND hwnd, INT iItem, INT mask, LPHDITEMW phdi, HEADER_ITEM* lpItem, BOOL isW) +{ + HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); + BOOL ret; + BOOL convertToAnsi = FALSE; + BOOL convertToUnicode = FALSE; + BOOL isUnicodeNotify = FALSE; + NMHDDISPINFOW dispInfo; + if (mask & HDI_TEXT) + { + convertToAnsi = (isW && infoPtr->nNotifyFormat == NFR_ANSI); + convertToUnicode = (!isW && infoPtr->nNotifyFormat == NFR_UNICODE); + } + isUnicodeNotify = (isW && !convertToAnsi); + + memset(&dispInfo, 0, sizeof(NMHDDISPINFOW)); + dispInfo.hdr.hwndFrom = hwnd; + dispInfo.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); + if (isUnicodeNotify || convertToUnicode) + { + dispInfo.hdr.code = HDN_GETDISPINFOW; + } + else + { + dispInfo.hdr.code = HDN_GETDISPINFOA; + } + dispInfo.iItem = iItem; + dispInfo.mask = mask; + /* + dispInfo.pszText = Alloc(sizeof(WCHAR) * 260); + dispInfo.cchTextMax = 260; + */ + ret = (BOOL) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM) dispInfo.hdr.idFrom, + (LPARAM) &dispInfo); + + TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", + dispInfo.mask, + (isUnicodeNotify ? debugstr_w(dispInfo.pszText) : (LPSTR) dispInfo.pszText), + (void*) dispInfo.lParam); + + if (dispInfo.mask & HDI_DI_SETITEM) + { + if (dispInfo.mask & HDI_IMAGE) + { + lpItem->iImage = dispInfo.iImage; + } + if (dispInfo.mask & HDI_TEXT) + { + if (isUnicodeNotify || convertToUnicode) + Str_SetPtrW(&lpItem->pszText, (LPCWSTR)dispInfo.pszText); + else /*if (convertToAnsi || !isW)*/ + Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)dispInfo.pszText); + } + + FIXME("NMHDDISPINFO returns with flags HDI_DI_SETITEM\n"); + } + + if (NULL != phdi) + { + if ((phdi->mask & mask) & HDI_IMAGE) + { + phdi->iImage = dispInfo.iImage; + } + if ((phdi->mask & mask) & HDI_TEXT) + { + if (isUnicodeNotify) + Str_GetPtrW ((LPCWSTR)dispInfo.pszText, phdi->pszText, phdi->cchTextMax); + else if (convertToUnicode) + Str_GetPtrWtoA ((LPCWSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); + else /*if (!isW) */ + Str_GetPtrA ((LPCSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); + } + } + return ret; +} + + static BOOL HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem) { @@ -712,11 +801,9 @@ static LRESULT -HEADER_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMA *phdi = (HDITEMA*)lParam; - INT nItem = (INT)wParam; HEADER_ITEM *lpItem; if (!phdi) @@ -727,12 +814,10 @@ if (phdi->mask == 0) return TRUE; - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) { + if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) lpItem = NULL; - } - else { + else lpItem = &infoPtr->items[nItem]; - } if (phdi->mask & HDI_BITMAP) phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; @@ -746,86 +831,34 @@ if (phdi->mask & HDI_LPARAM) phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; - if (phdi->mask & HDI_TEXT) { - if (lpItem == NULL) { - *phdi->pszText = 0; - } - else if (lpItem->pszText != LPSTR_TEXTCALLBACKW) { - if (lpItem->pszText) - WideCharToMultiByte (CP_ACP, 0, lpItem->pszText, -1, - phdi->pszText, phdi->cchTextMax, NULL, NULL); - else - *phdi->pszText = 0; - } - else - phdi->pszText = LPSTR_TEXTCALLBACKA; + if (phdi->mask & HDI_IMAGE) + { + phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; + if (lpItem->iImage == I_IMAGECALLBACK) + { + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode); + } } - if (phdi->mask & HDI_IMAGE) - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; - if (phdi->mask & HDI_ORDER) phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; - return TRUE; -} - - -static LRESULT -HEADER_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMW *phdi = (HDITEMW*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - - if (!phdi) - return FALSE; - - TRACE("[nItem=%d]\n", nItem); - - if (phdi->mask == 0) - return TRUE; - - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) { - lpItem = NULL; + if (phdi->mask & HDI_TEXT) + { + if (lpItem == NULL) *phdi->pszText = 0; /* null pointer check */ + else if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */ + { + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, phdi, lpItem, bUnicode); + } + else + { + if (bUnicode) + Str_GetPtrW (lpItem->pszText, phdi->pszText, phdi->cchTextMax); + else + Str_GetPtrWtoA (lpItem->pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); + } } - else { - lpItem = &infoPtr->items[nItem]; - } - if (phdi->mask & HDI_BITMAP) - phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; - - if (phdi->mask & HDI_FORMAT) - phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0; - - if (phdi->mask & HDI_WIDTH) - phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0; - - if (phdi->mask & HDI_LPARAM) - phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; - - if (phdi->mask & HDI_TEXT) { - if (lpItem == NULL) { - *phdi->pszText = 0; - } - else if (lpItem->pszText != LPSTR_TEXTCALLBACKW) { - if (lpItem->pszText) - lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax); - else - *phdi->pszText = 0; - } - else - phdi->pszText = LPSTR_TEXTCALLBACKW; - } - - if (phdi->mask & HDI_IMAGE) - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; - - if (phdi->mask & HDI_ORDER) - phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; - return TRUE; } @@ -914,13 +947,11 @@ static LRESULT -HEADER_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_InsertItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMA *phdi = (HDITEMA*)lParam; - INT nItem = (INT)wParam; HEADER_ITEM *lpItem; - INT len, iOrder; + INT iOrder; UINT i; if ((phdi == NULL) || (nItem < 0)) @@ -988,150 +1019,49 @@ if (phdi->mask & HDI_WIDTH) lpItem->cxy = phdi->cxy; - if (phdi->mask & HDI_TEXT) { - if (!phdi->pszText) /* null pointer check */ - phdi->pszText = ""; - if (phdi->pszText != LPSTR_TEXTCALLBACKA) { - len = MultiByteToWideChar(CP_ACP, 0, phdi->pszText, -1, NULL, 0); - lpItem->pszText = Alloc( len*sizeof(WCHAR) ); - MultiByteToWideChar(CP_ACP, 0, phdi->pszText, -1, lpItem->pszText, len); - } - else - lpItem->pszText = LPSTR_TEXTCALLBACKW; - } - if (phdi->mask & HDI_FORMAT) lpItem->fmt = phdi->fmt; if (lpItem->fmt == 0) lpItem->fmt = HDF_LEFT; - if (!(lpItem->fmt & HDF_STRING) && (phdi->mask & HDI_TEXT)) - { - lpItem->fmt |= HDF_STRING; - } if (phdi->mask & HDI_BITMAP) lpItem->hbm = phdi->hbm; if (phdi->mask & HDI_LPARAM) lpItem->lParam = phdi->lParam; - if (phdi->mask & HDI_IMAGE) - lpItem->iImage = phdi->iImage; - - lpItem->iOrder = iOrder; - - HEADER_SetItemBounds (hwnd); - - InvalidateRect(hwnd, NULL, FALSE); - - return nItem; -} - - -static LRESULT -HEADER_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMW *phdi = (HDITEMW*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - INT len, iOrder; - UINT i; - - if ((phdi == NULL) || (nItem < 0)) - return -1; - - if (nItem > infoPtr->uNumItem) - nItem = infoPtr->uNumItem; - - iOrder = (phdi->mask & HDI_ORDER) ? phdi->iOrder : nItem; - - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (sizeof (HEADER_ITEM)); - infoPtr->order = Alloc(sizeof(INT)); - infoPtr->uNumItem++; + if (phdi->mask & HDI_IMAGE) + { + if (phdi->iImage != I_IMAGECALLBACK) + { + lpItem->iImage = phdi->iImage; + } + else + { + lpItem->iImage = phdi->iImage; + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode); + } } - else { - HEADER_ITEM *oldItems = infoPtr->items; - INT *oldOrder = infoPtr->order; - infoPtr->uNumItem++; - infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); - if (nItem == 0) { - memcpy (&infoPtr->items[1], &oldItems[0], - (infoPtr->uNumItem-1) * sizeof(HEADER_ITEM)); + if (phdi->mask & HDI_TEXT) + { + if (!phdi->pszText) phdi->pszText = '\0'; /* null pointer check */ + if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + { + if (bUnicode) + Str_SetPtrW(&lpItem->pszText, phdi->pszText); + else + Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); } - else + else { - /* pre insert copy */ - if (nItem > 0) { - memcpy (&infoPtr->items[0], &oldItems[0], - nItem * sizeof(HEADER_ITEM)); - } - - /* post insert copy */ - if (nItem < infoPtr->uNumItem - 1) { - memcpy (&infoPtr->items[nItem+1], &oldItems[nItem], - (infoPtr->uNumItem - nItem - 1) * sizeof(HEADER_ITEM)); - } + lpItem->pszText = phdi->pszText; + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode); } - - infoPtr->order = Alloc(infoPtr->uNumItem * sizeof(INT)); - memcpy(infoPtr->order, oldOrder, iOrder * sizeof(INT)); - infoPtr->order[iOrder] = nItem; - memcpy(&infoPtr->order[iOrder + 1], &oldOrder[iOrder], - (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); - - Free (oldItems); - Free(oldOrder); + lpItem->fmt |= HDF_STRING; } - for (i = 0; i < infoPtr->uNumItem; i++) - { - if (i != iOrder && infoPtr->order[i] >= nItem) - infoPtr->order[i]++; - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; - } - - lpItem = &infoPtr->items[nItem]; - lpItem->bDown = FALSE; - - if (phdi->mask & HDI_WIDTH) - lpItem->cxy = phdi->cxy; - - if (phdi->mask & HDI_TEXT) { - WCHAR wide_null_char = 0; - if (!phdi->pszText) /* null pointer check */ - phdi->pszText = &wide_null_char; - if (phdi->pszText != LPSTR_TEXTCALLBACKW) { - len = strlenW (phdi->pszText); - lpItem->pszText = Alloc ((len+1)*sizeof(WCHAR)); - strcpyW (lpItem->pszText, phdi->pszText); - } - else - lpItem->pszText = LPSTR_TEXTCALLBACKW; - } - - if (phdi->mask & HDI_FORMAT) - lpItem->fmt = phdi->fmt; - - if (lpItem->fmt == 0) - lpItem->fmt = HDF_LEFT; - - if (!(lpItem->fmt &HDF_STRING) && (phdi->mask & HDI_TEXT)) - { - lpItem->fmt |= HDF_STRING; - } - if (phdi->mask & HDI_BITMAP) - lpItem->hbm = phdi->hbm; - - if (phdi->mask & HDI_LPARAM) - lpItem->lParam = phdi->lParam; - - if (phdi->mask & HDI_IMAGE) - lpItem->iImage = phdi->iImage; - lpItem->iOrder = iOrder; HEADER_SetItemBounds (hwnd); @@ -1207,11 +1137,9 @@ } static LRESULT -HEADER_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) +HEADER_SetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMA *phdi = (HDITEMA*)lParam; - INT nItem = (INT)wParam; HEADER_ITEM *lpItem; if (phdi == NULL) @@ -1221,7 +1149,8 @@ TRACE("[nItem=%d]\n", nItem); - if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, nItem, phdi->mask)) + if (HEADER_SendHeaderNotify (hwnd, bUnicode ? HDN_ITEMCHANGINGW : HDN_ITEMCHANGINGA, + nItem, phdi->mask)) return FALSE; lpItem = &infoPtr->items[nItem]; @@ -1234,113 +1163,46 @@ if (phdi->mask & HDI_LPARAM) lpItem->lParam = phdi->lParam; - if (phdi->mask & HDI_TEXT) { - if (phdi->pszText != LPSTR_TEXTCALLBACKA) { - if (lpItem->pszText) { - Free (lpItem->pszText); - lpItem->pszText = NULL; - } - if (phdi->pszText) { - INT len = MultiByteToWideChar (CP_ACP,0,phdi->pszText,-1,NULL,0); - lpItem->pszText = Alloc( len*sizeof(WCHAR) ); - MultiByteToWideChar (CP_ACP,0,phdi->pszText,-1,lpItem->pszText,len); - } - } - else - lpItem->pszText = LPSTR_TEXTCALLBACKW; - } - if (phdi->mask & HDI_WIDTH) lpItem->cxy = phdi->cxy; - if (phdi->mask & HDI_IMAGE) - lpItem->iImage = phdi->iImage; - - if (phdi->mask & HDI_ORDER) - { - INT i, nMin, nMax; - - if (lpItem->iOrder < phdi->iOrder) + if (phdi->mask & HDI_IMAGE) + { + if (phdi->iImage != I_IMAGECALLBACK) { - memmove(&infoPtr->order[lpItem->iOrder], - &infoPtr->order[lpItem->iOrder + 1], - (phdi->iOrder - lpItem->iOrder) * sizeof(INT)); - } - if (phdi->iOrder < lpItem->iOrder) + lpItem->iImage = phdi->iImage; + } + else { - memmove(&infoPtr->order[phdi->iOrder + 1], - &infoPtr->order[phdi->iOrder], - (lpItem->iOrder - phdi->iOrder) * sizeof(INT)); + lpItem->iImage = phdi->iImage; + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode); } - infoPtr->order[phdi->iOrder] = nItem; - nMin = min(lpItem->iOrder, phdi->iOrder); - nMax = max(lpItem->iOrder, phdi->iOrder); - for (i = nMin; i <= nMax; i++) - { - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; - } - } + } - HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask); - - HEADER_SetItemBounds (hwnd); - - InvalidateRect(hwnd, NULL, FALSE); - - return TRUE; -} - - -static LRESULT -HEADER_SetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMW *phdi = (HDITEMW*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - - if (phdi == NULL) - return FALSE; - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) - return FALSE; - - TRACE("[nItem=%d]\n", nItem); - - if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGW, nItem, phdi->mask)) - return FALSE; - - lpItem = &infoPtr->items[nItem]; - if (phdi->mask & HDI_BITMAP) - lpItem->hbm = phdi->hbm; - - if (phdi->mask & HDI_FORMAT) - lpItem->fmt = phdi->fmt; - - if (phdi->mask & HDI_LPARAM) - lpItem->lParam = phdi->lParam; - - if (phdi->mask & HDI_TEXT) { - if (phdi->pszText != LPSTR_TEXTCALLBACKW) { - if (lpItem->pszText) { - Free (lpItem->pszText); - lpItem->pszText = NULL; - } - if (phdi->pszText) { - INT len = strlenW (phdi->pszText); - lpItem->pszText = Alloc ((len+1)*sizeof(WCHAR)); - strcpyW (lpItem->pszText, phdi->pszText); - } + if (phdi->mask & HDI_TEXT) + { + if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + { + if (lpItem->pszText) + { + Free(lpItem->pszText); + lpItem->pszText = NULL; + } + if (phdi->pszText) + { + if (bUnicode) + Str_SetPtrW(&lpItem->pszText, phdi->pszText); + else + Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); + } } - else - lpItem->pszText = LPSTR_TEXTCALLBACKW; + else + { + lpItem->pszText = phdi->pszText; + HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode); + } } - if (phdi->mask & HDI_WIDTH) - lpItem->cxy = phdi->cxy; - - if (phdi->mask & HDI_IMAGE) - lpItem->iImage = phdi->iImage; - if (phdi->mask & HDI_ORDER) { INT i, nMin, nMax; @@ -1366,7 +1228,8 @@ } } - HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); + HEADER_SendHeaderNotify (hwnd, bUnicode ? HDN_ITEMCHANGEDW : HDN_ITEMCHANGEDA, + nItem, phdi->mask); HEADER_SetItemBounds (hwnd); @@ -1889,10 +1752,8 @@ return HEADER_GetImageList (hwnd); case HDM_GETITEMA: - return HEADER_GetItemA (hwnd, wParam, lParam); - case HDM_GETITEMW: - return HEADER_GetItemW (hwnd, wParam, lParam); + return HEADER_GetItemT (hwnd, (INT)wParam, (LPHDITEMW)lParam, msg == HDM_GETITEMW); case HDM_GETITEMCOUNT: return HEADER_GetItemCount (hwnd); @@ -1910,10 +1771,8 @@ return HEADER_HitTest (hwnd, wParam, lParam); case HDM_INSERTITEMA: - return HEADER_InsertItemA (hwnd, wParam, lParam); - case HDM_INSERTITEMW: - return HEADER_InsertItemW (hwnd, wParam, lParam); + return HEADER_InsertItemT (hwnd, (INT)wParam, (LPHDITEMW)lParam, msg == HDM_INSERTITEMW); case HDM_LAYOUT: return HEADER_Layout (hwnd, wParam, lParam); @@ -1932,10 +1791,8 @@ return HEADER_SetImageList (hwnd, (HIMAGELIST)lParam); case HDM_SETITEMA: - return HEADER_SetItemA (hwnd, wParam, lParam); - case HDM_SETITEMW: - return HEADER_SetItemW (hwnd, wParam, lParam); + return HEADER_SetItemT (hwnd, (INT)wParam, (LPHDITEMW)lParam, msg == HDM_SETITEMW); case HDM_SETORDERARRAY: return HEADER_SetOrderArray(hwnd, wParam, lParam); @@ -1982,6 +1839,7 @@ case WM_THEMECHANGED: return HEADER_ThemeChanged (hwnd); + case WM_PRINTCLIENT: case WM_PAINT: return HEADER_Paint (hwnd, wParam); _____ Modified: vendor/wine/dlls/comctl32/current/hotkey.c --- vendor/wine/dlls/comctl32/current/hotkey.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/hotkey.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -516,6 +516,7 @@ case WM_NCCREATE: return HOTKEY_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); + case WM_PRINTCLIENT: case WM_PAINT: HOTKEY_Paint(infoPtr, (HDC)wParam); return 0; _____ Modified: vendor/wine/dlls/comctl32/current/imagelist.c --- vendor/wine/dlls/comctl32/current/imagelist.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/imagelist.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -1581,8 +1581,7 @@ * * Creates an image list from a bitmap, icon or cursor. * - * SEE - * ImageList_LoadImageW () + * See ImageList_LoadImageW. */ HIMAGELIST WINAPI _____ Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -3272,6 +3272,9 @@ { TRACKMOUSEEVENT trackinfo; + if (!(fwKeys & MK_LBUTTON)) + infoPtr->bLButtonDown = FALSE; + if (infoPtr->bLButtonDown && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) { LVHITTESTINFO lvHitTestInfo; @@ -4187,7 +4190,7 @@ HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; HIMAGELIST dragList = 0; - TRACE("iItem=%d Count=%d \n", iItem, infoPtr->nItemCount); + TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); if (iItem < 0 || iItem >= infoPtr->nItemCount) return 0; @@ -5135,7 +5138,7 @@ * * NOTE: * This is the internal 'GetItem' interface -- it tries to - * be smart, and avoids text copies, if possible, by modifing + * be smart and avoid text copies, if possible, by modifying * lpLVItem->pszText to point to the text string. Please note * that this is not always possible (e.g. OWNERDATA), so on * entry you *must* supply valid values for pszText, and cchTextMax. @@ -5610,6 +5613,7 @@ { POINT Position; LVITEMW lvItem; + INT nColumn = lprc->top; if (!lprc) return FALSE; @@ -5622,9 +5626,11 @@ if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; + if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; + lvItem.mask = 0; lvItem.iItem = nItem; - lvItem.iSubItem = lprc->top; + lvItem.iSubItem = nColumn; if (lvItem.mask && !LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; switch(lprc->left) _____ Modified: vendor/wine/dlls/comctl32/current/monthcal.c --- vendor/wine/dlls/comctl32/current/monthcal.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/monthcal.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -2007,6 +2007,7 @@ case WM_LBUTTONUP: return MONTHCAL_LButtonUp(infoPtr, lParam); + case WM_PRINTCLIENT: case WM_PAINT: return MONTHCAL_Paint(infoPtr, wParam); _____ Modified: vendor/wine/dlls/comctl32/current/pager.c --- vendor/wine/dlls/comctl32/current/pager.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/pager.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -34,6 +34,8 @@ * PGS_DRAGNDROP * Notifications: * PGN_HOTITEMCHANGE + * Messages: + * WM_PRINT and/or WM_PRINTCLIENT * * TESTING: * Tested primarily with the controlspy Pager application. _____ Modified: vendor/wine/dlls/comctl32/current/progress.c --- vendor/wine/dlls/comctl32/current/progress.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/progress.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -627,6 +627,7 @@ case WM_SETFONT: return (LRESULT)PROGRESS_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam); + case WM_PRINTCLIENT: case WM_PAINT: return PROGRESS_Paint (infoPtr, (HDC)wParam); _____ Modified: vendor/wine/dlls/comctl32/current/propsheet.c --- vendor/wine/dlls/comctl32/current/propsheet.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/propsheet.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -3455,6 +3455,7 @@ return TRUE; } + case WM_PRINTCLIENT: case WM_PAINT: PROPSHEET_Paint(hwnd, (HDC)wParam); return TRUE; _____ Modified: vendor/wine/dlls/comctl32/current/rebar.c --- vendor/wine/dlls/comctl32/current/rebar.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/rebar.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -50,7 +50,6 @@ * - WM_LBUTTONDBLCLK * - WM_MEASUREITEM * - WM_PALETTECHANGED - * - WM_PRINTCLIENT * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN * - WM_RBUTTONUP @@ -4768,11 +4767,11 @@ case WM_NOTIFYFORMAT: return REBAR_NotifyFormat (infoPtr, wParam, lParam); + case WM_PRINTCLIENT: case WM_PAINT: return REBAR_Paint (infoPtr, wParam, lParam); /* case WM_PALETTECHANGED: supported according to ControlSpy */ -/* case WM_PRINTCLIENT: supported according to ControlSpy */ /* case WM_QUERYNEWPALETTE:supported according to ControlSpy */ /* case WM_RBUTTONDOWN: supported according to ControlSpy */ /* case WM_RBUTTONUP: supported according to ControlSpy */ _____ Modified: vendor/wine/dlls/comctl32/current/status.c --- vendor/wine/dlls/comctl32/current/status.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/status.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -1342,6 +1342,7 @@ case WM_NOTIFYFORMAT: return STATUSBAR_NotifyFormat(infoPtr, (HWND)wParam, (INT)lParam); + case WM_PRINTCLIENT: case WM_PAINT: return STATUSBAR_WMPaint (infoPtr, (HDC)wParam); _____ Modified: vendor/wine/dlls/comctl32/current/string.c --- vendor/wine/dlls/comctl32/current/string.c 2005-11-16 21:22:07 UTC (rev 19277) +++ vendor/wine/dlls/comctl32/current/string.c 2005-11-16 21:24:43 UTC (rev 19278) @@ -22,6 +22,9 @@ * */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> #include <stdlib.h> /* atoi */ @@ -171,13 +174,52 @@ return NULL; } +/********************************************************************** **** + * StrCmpNIA [COMCTL32.353] + * + * Compare two strings, up to a maximum length, ignoring case. + * + * PARAMS + * lpszStr [I] First string to compare + * lpszComp [I] Second string to compare + * iLen [I] Maximum number of chars to compare. + * + * RETURNS + * An integer less than, equal to or greater than 0, indicating that + * lpszStr is less than, the same, or greater than lpszComp. + */ +INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) +{ + INT iRet; + + TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); + + iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); + return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; +} + /*********************************************************************** ** + * StrCmpNIW [COMCTL32.361] + * + * See StrCmpNIA. + */ +INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) +{ + INT iRet; + + TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); + + iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); + return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; +} + +/********************************************************************** *** * COMCTL32_StrStrHelperA * * Internal implementation of StrStrA/StrStrIA */ static LPSTR COMCTL32_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, - int (*pStrCmpFn)(LPCSTR,LPCSTR,size_t)) + INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; @@ -201,7 +243,7 @@ * Internal implementation of StrStrW/StrStrIW */ static LPWSTR COMCTL32_StrStrHelperW(LPCWSTR lpszStr, LPCWSTR lpszSearch, - int (*pStrCmpFn)(LPCWSTR,LPCWSTR,int)) + INT (WINAPI *pStrCmpFn)(LPCWSTR,LPCWSTR,INT)) { int iLen; @@ -235,7 +277,7 @@ { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); - return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, strncasecmp); + return COMCTL32_StrStrHelperA(lpszStr, lpszSearch, StrCmpNIA); } /*********************************************************************** *** @@ -264,7 +306,7 @@ { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); - return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, strncmpiW); + return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, StrCmpNIW); } /*********************************************************************** *** @@ -365,45 +407,6 @@ } /*********************************************************************** *** - * StrCmpNIA [COMCTL32.353] - * - * Compare two strings, up to a maximum length, ignoring case. - * - * PARAMS - * lpszStr [I] First string to compare - * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. - * - * RETURNS - * An integer less than, equal to or greater than 0, indicating that - * lpszStr is less than, the same, or greater than lpszComp. - */ -int WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, int iLen) -{ - INT iRet; - - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; -} - -/********************************************************************** *** - * StrCmpNIW [COMCTL32.361] - * - * See StrCmpNIA. - */ -INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, int iLen) -{ - INT iRet; - - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; -} - -/********************************************************************** **** * StrCmpNW [COMCTL32.360] * * See StrCmpNA. @@ -501,7 +504,7 @@ { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); [truncated at 1000 lines; 17802 more skipped]

1 0

[frik85] 19279: RosCMS (Part 4)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 4) Added: trunk/web/reactos.org/htdocs/roscms/images/genpage.gif Added: trunk/web/reactos.org/htdocs/roscms/images/history.gif Added: trunk/web/reactos.org/htdocs/roscms/images/home.gif Added: trunk/web/reactos.org/htdocs/roscms/images/info.gif Added: trunk/web/reactos.org/htdocs/roscms/images/info_15x15.gif Added: trunk/web/reactos.org/htdocs/roscms/images/line.gif Added: trunk/web/reactos.org/htdocs/roscms/images/lock.gif Added: trunk/web/reactos.org/htdocs/roscms/images/logo.jpg Added: trunk/web/reactos.org/htdocs/roscms/images/logo_myreactos.jpg Added: trunk/web/reactos.org/htdocs/roscms/images/logo_roscms.jpg _____ Added: trunk/web/reactos.org/htdocs/roscms/images/genpage.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/genpage.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/history.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/history.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/home.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/home.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/info.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/info.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/info_15x15.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/info_15x15.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/line.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/line.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/lock.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/lock.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/logo.jpg (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/logo.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg _____ Added: trunk/web/reactos.org/htdocs/roscms/images/logo_myreactos.jpg (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/logo_myreactos.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg _____ Added: trunk/web/reactos.org/htdocs/roscms/images/logo_roscms.jpg (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/logo_roscms.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg

1 0

[frik85] 19277: RosCMS (Part3)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part3) Added: trunk/web/reactos.org/htdocs/roscms/images/ Added: trunk/web/reactos.org/htdocs/roscms/images/active.gif Added: trunk/web/reactos.org/htdocs/roscms/images/bbcode.gif Added: trunk/web/reactos.org/htdocs/roscms/images/delete.gif Added: trunk/web/reactos.org/htdocs/roscms/images/dot.gif Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php Added: trunk/web/reactos.org/htdocs/roscms/inc/body.php Added: trunk/web/reactos.org/htdocs/roscms/inc/dev.php Added: trunk/web/reactos.org/htdocs/roscms/inc/dev_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Added: trunk/web/reactos.org/htdocs/roscms/inc/head.php Added: trunk/web/reactos.org/htdocs/roscms/inc/home.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_account_check.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_accountlevel_check.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_description_table.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_login.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_dev.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_roscms.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_team.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_translator.php Added: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_user.php Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/ Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/de.php Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/fr.php Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php Added: trunk/web/reactos.org/htdocs/roscms/inc/login.php Added: trunk/web/reactos.org/htdocs/roscms/inc/logout.php Added: trunk/web/reactos.org/htdocs/roscms/inc/member_bar.php Added: trunk/web/reactos.org/htdocs/roscms/inc/noaccess.php Added: trunk/web/reactos.org/htdocs/roscms/inc/nopermission.php Added: trunk/web/reactos.org/htdocs/roscms/inc/securitylog.php Added: trunk/web/reactos.org/htdocs/roscms/inc/structure.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_bugzilla.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_utils.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_wiki.php Added: trunk/web/reactos.org/htdocs/roscms/inc/team.php Added: trunk/web/reactos.org/htdocs/roscms/inc/team_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/translator.php Added: trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php Added: trunk/web/reactos.org/htdocs/roscms/inc/translator_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_account.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd2.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_gls.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_help.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_help_bbcode.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_help_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_login.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_profil.php Added: trunk/web/reactos.org/htdocs/roscms/inc/user_register.php Added: trunk/web/reactos.org/htdocs/roscms/inc/utils.php _____ Added: trunk/web/reactos.org/htdocs/roscms/images/active.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/active.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/bbcode.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/bbcode.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/delete.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/images/dot.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/roscms/images/dot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,164 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + // To prevent hacking activity: + if ( !defined('ROSCMS_SYSTEM') OR !defined('ROSCMS_SYSTEM_ADMIN') ) + { + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_admin_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: admin_users.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + +?> +<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Group Members</span> + <ul> + <li><strong>Group Members</strong></li> + </ul> + + + <p>Action: <a href="#">New Membership</a> | <a href="?page=admin&sec=usrgrpmbr&sec2=view">reset + filters & sort</a></p> +<?php + + + if ($rpm_lang_id == "") { + $rpm_lang_id="all"; + } + echo '<p>Language: '; + echo '<b>All</b>'; + $ros_cms_intern_users_lang = " "; + echo '</p>'; + + if ($rpm_filt == "") { + $rpm_filt="active"; + } + echo '<p>Filter: '; + echo '<b>active</b>'; + $ros_cms_intern_users_filt = " "; + echo '</p>'; + + if ($rpm_sort == "") { + $rpm_sort="id"; + } + echo '<p>Sorted by: '; + if ($rpm_sort == "id") { + echo '<b>user ID</b>'; + $ros_cms_intern_users_sortby="usergroupmember_userid"; + $ros_cms_intern_users_sort="ASC"; + } + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=id&filt=' .$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">user ID</a>'; + } + echo ' | '; + if ($rpm_sort == "group") { + echo '<b>group ID</b>'; + $ros_cms_intern_users_sortby="usergroupmember_usergroupid"; + $ros_cms_intern_users_sort="ASC"; + } + else { + echo '<a href="?page=admin&sec=usrgrpmbr&sec2=view&sort=group&fil t='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">group ID</a>'; + } + echo '</p>'; + +?> + <table width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="6%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Action</strong></font></div></td> + <td width="4%" bgcolor="#5984C3"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>ID</strong></font></div></td> + <td width="20%" bgcolor="#5984C3"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> + <td width="20%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Usergroup</strong></font></div></td> + <td width="50%" bgcolor="#5984C3"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Usergroup + description</strong></font></div></td> + </tr> + <?php + + if($roscms_intern_account_level==100) { + $query_page = mysql_query("SELECT * + FROM usergroup_members + $ros_cms_intern_users_filt $ros_cms_intern_users_lang + ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort") ; + } + else { + $query_page = mysql_query("SELECT * + FROM usergroup_members + $ros_cms_intern_users_filt AND user_account_hidden != 0 $ros_cms_intern_users_lang + ORDER BY '$ros_cms_intern_users_sortby' $ros_cms_intern_users_sort") ; + } + + $farbe1="#E2E2E2"; + $farbe2="#EEEEEE"; + $zaehler="0"; + //$farbe="#CCCCC"; + + while($result_page = mysql_fetch_array($query_page)) { // users +?> + <tr> + <td width="9%" valign="middle" bgcolor="<?php + $zaehler++; + if ($zaehler == "1") { + echo $farbe1; + $farbe = $farbe1; + } + elseif ($zaehler == "2") { + $zaehler="0"; + echo $farbe2; + $farbe = $farbe2; + } + ?>" title="RosCMS action buttons:

* View account
* Delete account
* Email
* Website"> + <div align="center"><img src="images/view.gif" alt="View" width="19" height="18" border="0"></div></td> + <td width="7%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"><?php echo "<b>".$result_page['usergroupmember_userid']."</b>"; ?></font></div></td> + <td width="10%" valign="middle" bgcolor="<?php echo $farbe; ?>"><font face="Arial, Helvetica, sans-serif"><?php + $query_usra = mysql_query("SELECT user_id, user_name FROM users WHERE user_id = '".$result_page['usergroupmember_userid']."'") or die('DB error (membership script)!'); + $result_usra = mysql_fetch_array($query_usra) or die('DB error (show_sessions script)'); + + echo $result_usra['user_name']; ?> + </font></td> + <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>" title="<?php echo $result_page['usergroupmember_usergroupid']; ?>"><div align="left"><font face="Arial, Helvetica, sans-serif"> + <?php + //echo "SELECT usrgroup_name_id, usrgroup_name FROM usergroups WHERE usrgroup_name_id = '".$result_page['usergroupmember_usergroupid']."'<br>"; + $query_grpb = mysql_query("SELECT usrgroup_name_id, usrgroup_name, usrgroup_description FROM usergroups WHERE usrgroup_name_id = '".$result_page['usergroupmember_usergroupid']."'") or die('DB error (membership script)!'); + $result_grpb = mysql_fetch_array($query_grpb) or die('DB error (membership script)'); + + echo $result_grpb['usrgroup_name']; + ?> + </font></div></td> + <td width="15%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <font face="Arial, Helvetica, sans-serif"><?php + echo substr(htmlentities($result_grpb['usrgroup_description'], ENT_QUOTES), 0, 50)."..."; + ?></font></tr> + <?php + } // end while +?> + </table> + <?php + $roscms_infotable = "user"; + include("inc/inc_description_table.php"); +?> +</div> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,85 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +?> +<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Usergroups + </span> + <ul> + <li><strong>Usergroups</strong></li> + </ul> + + <table width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="6%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Action</strong></font></div></td> + <td width="14%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Groupname</strong></font></div></td> + <td width="70%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="10%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Securitylevel</strong></font></div></td> + </tr> + <?php + + $query_page = mysql_query("SELECT * + FROM usergroups + ORDER BY 'usrgroup_securitylevel' ASC ;") ; + + $farbe1="#E2E2E2"; + $farbe2="#EEEEEE"; + $zaehler="0"; + //$farbe="#CCCCC"; + + while($result_page = mysql_fetch_array($query_page)) { // Pages +?> + <tr> + <td valign="top" bgcolor="<?php + $zaehler++; + if ($zaehler == "1") { + echo $farbe1; + $farbe = $farbe1; + } + elseif ($zaehler == "2") { + $zaehler="0"; + echo $farbe2; + $farbe = $farbe2; + } + ?>" title="RosCMS action buttons:

* View page
* Delete page
* Locked"> + <div align="left"> + <?php if($roscms_intern_usrgrp_sadmin == true) { ?> + <a href="?page=admin&sec=usergroups&viewid=<?php echo $result_page['usrgroup_name_id']; ?>"><img src="images/view.gif" alt="Delete" width="19" height="18" border="0"></a> + <?php } ?> + </div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_page['usrgroup_name']; + ?> + </font></div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"><font face="Arial, Helvetica, sans-serif"><?php echo $result_page['usrgroup_description']; ?></font></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_page['usrgroup_securitylevel']; + ?> + </font></div></td> + </tr> + <?php + } // end while +?> + </table> +</div> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,102 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + Ge van Geldorp <gvg(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +?> +<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Sessions</span> + <ul> + <li><strong>Sessions</strong></li> + </ul> +<?php + if($roscms_intern_usrgrp_sadmin == true) { + $roscms_deletesesid=""; + if(array_key_exists("deletesesid", $_GET)) $roscms_deletesesid=$_GET["deletesesid"]; + + if ($roscms_deletesesid != "") { + $page_postc="DELETE FROM user_sessions WHERE usersession_id = '$roscms_deletesesid' LIMIT 1 ;"; + $page_post_listc=mysql_query($page_postc); + } + } +?> + + <table width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="6%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Action</strong></font></div></td> + <td width="8%"> + <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Account</strong></font></div></td> + <td width="10%"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Expires</strong></font></div></td> + <td width="15%"> +<div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Browser</strong></font></div></td> + <td width="10%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>IP + Address</strong></font></div></td> + </tr> + <?php + + $query_page = mysql_query("SELECT * + FROM user_sessions + ORDER BY 'usersession_timestamp_touch2' DESC ;") ; + + $farbe1="#E2E2E2"; + $farbe2="#EEEEEE"; + $zaehler="0"; + //$farbe="#CCCCC"; + + while($result_page = mysql_fetch_array($query_page)) { // Pages +?> + <tr> + <td valign="top" bgcolor="<?php + $zaehler++; + if ($zaehler == "1") { + echo $farbe1; + $farbe = $farbe1; + } + elseif ($zaehler == "2") { + $zaehler="0"; + echo $farbe2; + $farbe = $farbe2; + } + ?>" title="RosCMS action buttons:

* View page
* Delete page
* Locked"> + <div align="left"><?php if($roscms_intern_usrgrp_sadmin == true) { ?> + <a href="?page=admin&sec=sessions&deletesesid=<?php echo $result_page['usersession_id']; ?>"><img src="images/delete.gif" alt="Delete" width="19" height="18" border="0"></a> + <?php } ?> + </div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font face="Arial, Helvetica, sans-serif"> + <?php + $query_usra = mysql_query("SELECT user_id, user_name FROM users WHERE user_id = '".$result_page['usersession_user_id']."'") or die('DB error (show_sessions script)!'); + $result_usra = mysql_fetch_array($query_usra) or die('DB error (show_sessions script)'); + + echo "<b>".$result_usra['user_name']."</b>"; ?></font></div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"><font face="Arial, Helvetica, sans-serif"><?php echo "<b>".$result_page['usersession_expires']."</b>"; ?></font></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_page['usersession_browseragent']; + ?> + </font></div></td> + <td valign="top" bgcolor="<?php echo $farbe; ?>"> <font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_page['usersession_ipaddress']; + ?> + </font></td> + </tr> + <?php + } // end while +?> + </table> +</div> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/body.php --- trunk/web/reactos.org/htdocs/roscms/inc/body.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/body.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,64 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + // To prevent hacking activity: + if ( !defined('ROSCMS_SYSTEM') ) + { + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: body.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + +?> + + + </td> + </tr> +</table> + + +<hr size="1" /> + +<address> + <p align="center"> + ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.<br /> +<?php + + // This page was generated in ... + $roscms_gentime = microtime(); + $roscms_gentime = explode(' ',$roscms_gentime); + $roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; + $roscms_pg_end = $roscms_gentime; + $roscms_totaltime = ($roscms_pg_end - $roscms_pg_start); + $roscms_showtime = number_format($roscms_totaltime, 4, '.', ''); + echo "<br>Page generated in " . $roscms_showtime . " seconds"; + +?> + </p> +</address> + +</body> +</html> \ No newline at end of file Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/body.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/dev.php --- trunk/web/reactos.org/htdocs/roscms/inc/dev.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/dev.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,76 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + // To prevent hacking activity: + if ( !defined('ROSCMS_SYSTEM') ) + { + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_user_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: user.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + + + if ( !defined('ROSCMS_SYSTEM_DEV') ) { + define ("ROSCMS_SYSTEM_DEV", "Developer Interface"); // to prevent hacking activity + } + + if ($roscms_intern_usrgrp_dev == true) { // only for developer group member + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + create_structure($rpm_page); + + switch ($rpm_sec) { + case "content": + if ($rpm_sec2=="view") { + include("inc/admin_content.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_content_edit.php"); + } + else if ($rpm_sec2=="delete") { + include("inc/admin_content.php"); + } + else if ($rpm_sec2=="save") { + include("inc/admin_content.php"); + //include("inc/admin_content_edit.php"); + } + break; + case "devpage": + echo "<br><p>under construction ...</p>"; + break; + case "help": + echo "<br><p>under construction ...</p>"; + break; + case "overview": + default: + include("inc/dev_overview.php"); + break; + } + } + else { // for all other user groups + header("location:?page=nopermission"); + } + +?> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/dev.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/dev_overview.php --- trunk/web/reactos.org/htdocs/roscms/inc/dev_overview.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/dev_overview.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,54 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +?> +<table border="0" cellspacing="0" cellpadding="0" width="650"> + <tr> + + <td colspan="3"><span class="contentSmallTitle">Developer Interface Overview</span></td> + </tr> + <tr> + <td colspan="2" bgcolor="#F9F8F8"> <table width="650" border="0" cellpadding="4"> + <tr> + <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="#">Overview</a> + </font></strong></div></td> + <td width="10"> </td> + <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="#">My + own Page</a></font></strong></div></td> + </tr> + <tr> + <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="#">Static + Page Content</a></font></strong></div></td> + <td width="10"> </td> + <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td width="300"><strong><font face="Arial, Helvetica, sans-serif"><a href="#">Documentation</a></font></strong></td> + </tr> + </table> + </tr> + <tr bgcolor=#AEADAD> + <td><img src="images/line.gif" width="1" height="1"></td> + </tr> + </table> +<br /> +<div class="contentSmall"> <span class="contentSmallTitle">Developer Interface - Overview</span> +<p><placeholder></p> +</div> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/dev_overview.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-11-16 21:19:57 UTC (rev 19276) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-11-16 21:22:07 UTC (rev 19277) @@ -0,0 +1,433 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + + ReactOS CMS - Page Generator + + (c) by Klemens Friedl <frik85> + +*/ + + + // To prevent hacking activity: + if ( !defined('ROSCMS_SYSTEM') ) + { + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="roscms_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: generate_page.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + + function eval_template($code, $dyncontid) // function code from: http://www.zend.com/zend/art/buffering.php + { + //echo "<br>ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ".$dyncontid."<br>"; + //ob_end_clean(); + ob_start(); + $roscms_template_var_pageid=""; + $roscms_template_var_pageid=$dyncontid; + eval(' ?'.'> '.$code.' <'.'?php '); + $output = ob_get_contents(); + ob_end_clean(); + //echo ob_get_status(); + //$roscms_template_var_pageid=""; + return $output; + } + + + + // RosCMS Config File: + include("roscms_config.php"); + + //ini_set("max_execution_time","false"); + set_time_limit(0); + + + + //include("db/connect_db.inc.php"); // database connection script + + + $roscms_intern_page_counter = 1; // page counter + + // This page was generated in ... + $gentime = microtime(); + $gentime = explode(' ',$gentime); + $gentime = $gentime[1] + $gentime[0]; + $pg_start = $gentime; + + if ($rpm_site == "" || $rpm_sec2=="genpage") { + echo "<p><b>RosCMS - HTML & XHTML static page generation</b></p><br>"; + } + + // HTML & XHTML + for($counter=1;$counter<3;$counter++) { + if ($rpm_site != "" && $rpm_sec2=="view") { + echo "\n\n"; + switch ($rpm_forma) { + case "html": + $fileformat=$roscms_intern_fileformat_html; + $w3cformat=$roscms_intern_w3cformat_html; + //echo "<b>HTML</b><br>"; + $roscms_path_formatfile="../".$roscms_intern_path_html; // output path + break; + default: + case "xhtml": + $fileformat=$roscms_intern_fileformat_xhtml; + $w3cformat=$roscms_intern_w3cformat_xhtml; + //echo "<br><br><b>XHTML</b><br>"; + $roscms_path_formatfile="../".$roscms_intern_path_xhtml; // output path + break; + } + } + else { + switch ($counter) { + case 1: + $fileformat=$roscms_intern_fileformat_html; + $w3cformat=$roscms_intern_w3cformat_html; + echo "<b>HTML</b><br>"; + $roscms_path_formatfile="../".$roscms_intern_path_html; // output path + break; + case 2: + $fileformat=$roscms_intern_fileformat_xhtml; + $w3cformat=$roscms_intern_w3cformat_xhtml; + echo "<br><br><b>XHTML</b><br>"; + $roscms_path_formatfile="../".$roscms_intern_path_xhtml; // output path + break; + } + } + + // Languages: + if ($rpm_site != "" && $rpm_sec2=="view") { + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' AND lang_id = '$rpm_lang' + ORDER BY 'lang_level' DESC"; +// echo "<br>".$rpm_lang; + } + else if ($rpm_site != "" && $rpm_sec2=="genpage") { + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' AND lang_id = '$rpm_lang' + ORDER BY 'lang_level' DESC"; + } + else { + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + } + $sql_query_lang=mysql_query($sql_lang); + + while($myrow_lang=mysql_fetch_row($sql_query_lang)) { // Languages + + // Pages: + + if ($rpm_site != "") { + $query_page = mysql_query("SELECT * + FROM pages + WHERE page_visible != 0 AND page_active = '1' AND page_name = '$rpm_site' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') + ORDER BY 'page_name' ASC") ; +// echo "<br>=".$rpm_site; + } + else { + echo "<br><br>  <b>".$myrow_lang[1]."</b><br>"; + $query_page = mysql_query("SELECT * + FROM pages + WHERE page_visible != 0 AND page_active = '1' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') + ORDER BY 'page_name' ASC"); + } + // $result = mysql_fetch_array($query); AND pages_extra = '' + while($result_page = mysql_fetch_array($query_page)) { // Pages + $data_page=$result_page['page_text']; + $data_page_extra=$result_page['pages_extra']; + $data_page_title=""; + $data_page_title=$result_page['page_title']; + + + + // Pages Dynamic: + + $current_pagedyn=$result_page['page_name']; + $current_pageid=$result_page['page_id']; + + $query_page_dynamic=""; + $query_page_dynamic_cont_id=""; + if ($result_page['pages_extra'] == "dynamic") { + //echo "<br><br>--Dynamic--"; + $query_page_dynamic = mysql_query("SELECT * + FROM `dyn_content` + WHERE 1 AND `dyn_content_nr` = 1 AND `dyn_content_name` = '$current_pagedyn' + ORDER BY `dyn_content_id` ASC "); + //echo "!!".$query_page_dynamica."-!"; + } + else { + //echo "<br><br>--NOTDynamic--"; + $query_page_dynamic = mysql_query("SELECT * + FROM `pages` + WHERE 1 AND `page_id` = $current_pageid LIMIT 1 "); // temp + } + + while($result_page_dynamic = mysql_fetch_array($query_page_dynamic)) { // Pages Dynamic + if (array_key_exists("dyn_content_id", $result_page_dynamic)) $query_page_dynamic_cont_id=$result_page_dynamic['dyn_content_id']; + + if ($query_page_dynamic_cont_id == "") { + $roscms_pagedyn="0"; + //echo "+NO+"; + } + else { + $roscms_pagedyn="1"; + $data_page=$result_page['page_text']; + //echo "+YES+"; + } + + // This page was generated in (for every page) ... + $gentimea = microtime(); + $gentimea = explode(' ',$gentimea); + $gentimea = $gentimea[1] + $gentimea[0]; + $pg_starta = $gentimea; + + // Content: + $query_content = mysql_query("SELECT * + FROM content + WHERE content_visible != 0 AND content_active = '1' AND (content_lang = '$myrow_lang[0]' OR content_lang = '$w3cformat' OR content_lang = 'all') + ORDER BY 'content_id' ASC"); + while($result_content = mysql_fetch_array($query_content)) { // Content + $data_content=$result_content['content_text']; + $data_page = str_replace("[#cont_".$result_content['content_name']."]",$data_content, $data_page); + + // RosCMS specific tags (only very important tags!): + $data_page = str_replace("[#roscms_path_homepage]",$roscms_intern_path_server,$data_p age); // homepage path + if (preg_match("=roscms_content_author=", $data_page)) { // to same generation time + $res_content_authorid=$result_content['content_usrname_id']; + //echo "<br>br><br><b>===".$res_content_authorid."</b><br><br><br>"; + $query_usraccountc= mysql_query("SELECT * + FROM `users` + WHERE `user_id` = ".$res_content_authorid." LIMIT 0 , 1"); + $result_usraccountc=mysql_fetch_array($query_usraccountc); + $data_page = str_replace("[#roscms_content_author]",$result_usraccountb['user_name'], $data_page); // account that changed the content + } + } // end while - Content + + // PHP templates for DynContent: + $query_dyninctexta = mysql_query("SELECT * + FROM `include_text` + WHERE 1 AND `inc_extra` = 'template_php' AND `inc_vis` = 1"); + while($result_dyninctexta = mysql_fetch_array($query_dyninctexta)) { // PHP templates for DynContent + if (preg_match("=inc_".$result_dyninctexta["inc_word"]."=", $data_page)) { // to same generation time + $ev_buffer=eval_template($result_dyninctexta["inc_text"],$query_page_dyn amic_cont_id); + $data_page = str_replace("[#inc_".$result_dyninctexta["inc_word"]."]",$ev_buffer,$dat a_page); + $ev_buffer=""; + } + } // end while - PHP template for DynContent + + // Include_Text: + $query_inc_text = mysql_query("SELECT inc_word, inc_text, inc_lang, inc_vis + FROM include_text + WHERE inc_vis=1 AND `inc_extra` = '' AND (inc_lang = '$myrow_lang[0]' OR inc_lang = '$w3cformat' OR inc_lang = 'all') + ORDER BY 'inc_level' ASC") ; + while($result_inc_text = mysql_fetch_array($query_inc_text)) { // Include_Text + $data_page = str_replace("[#inc_".$result_inc_text['inc_word']."]",$result_inc_text[' inc_text'],$data_page); + + // RosCMS specific tags (only very important tags!): + $data_page = str_replace("[#roscms_path_homepage]",$roscms_intern_path_server,$data_p age); // homepage path + } // end while - Include_Text + + // RosCMS specific tags: + if ($data_page_extra == "dynamic") { + $data_page = str_replace("[#roscms_filename]",$result_page['page_name']."_".$query_pa ge_dynamic_cont_id.".".$fileformat,$data_page); // current filename + $data_page = str_replace("[#roscms_pagename]",$result_page['page_name']."_".$query_pa ge_dynamic_cont_id,$data_page); // current page name + $data_page = str_replace("[#roscms_pagetitle]",ucfirst($result_page['page_name']."_". $query_page_dynamic_cont_id),$data_page); // current page title + } + else { + $data_page = str_replace("[#roscms_filename]",$result_page['page_name'].".".$fileform at,$data_page); // current filename + $data_page = str_replace("[#roscms_pagename]",$result_page['page_name'],$data_page); // current page name + $data_page = str_replace("[#roscms_pagetitle]",$data_page_title,$data_page); // current page title + } + $data_page = str_replace("[#roscms_language]",$myrow_lang[1],$data_page); // current language + $data_page = str_replace("[#roscms_language_short]",$myrow_lang[0],$data_page); // current language + $data_page = str_replace("[#roscms_format]",$w3cformat,$data_page); // current page format (xhtml/html) + $data_page = str_replace("[#roscms_date]",date("Y-m-d"),$data_page); // current date + $zeit = localtime(time() , 1); + $data_page = str_replace("[#roscms_time]", sprintf("%02d",$zeit['tm_hour']).":".sprintf("%02d",$zeit['tm_min']),$da ta_page); // current time + $query_usraccountb= mysql_query("SELECT * + FROM `users` + WHERE `user_id` = ".$roscms_intern_account_id." LIMIT 0 , 1"); + $result_usraccountb=mysql_fetch_array($query_usraccountb); + $roscms_intern_usrnameid = $result_page['page_usrname_id']; + $query_usraccount= mysql_query("SELECT * + FROM `users` + WHERE `user_id` = ".$roscms_intern_usrnameid." LIMIT 0 , 1"); + $result_usraccount=mysql_fetch_array($query_usraccount); + $data_page = str_replace("[#roscms_user]",$result_usraccountb['user_name'],$data_page ); // account that generate the page + $data_page = str_replace("[#roscms_inc_author]",$result_usraccount['user_name'],$data _page); // account that changed the include text + $data_page = str_replace("[#roscms_page_version]",$result_page['page_version'],$data_ page); // current page version + + + // Add extern link symbol: (code by Dr. Fred) + + /* 1.) check if href does begin with http:// */ + $data_page = str_replace ('(<a [^h]*)(href\s*=\s*"(http|ftp)://)', '\1class="extern" \2', $data_page); + /* 2.) remove extern-class again if the link goes to http://*.reactos.org */ + $data_page = str_replace ('class="extern" (href="http://([^\.]*.)?([^\.]*.)?reactos.org)', '\1', $data_page); + /* 3.) remove extern if img */ + $data_page = str_replace ('class="extern" (href[^>]*>([^<]*<img|[^<]*<[^<\/]*<img|[^>]*<[^<\/]]*<[^<a]*<img))', '\1', $data_page); + + + $roscms_pagename_file=$result_page['page_name']; + if ($roscms_pagedyn=="1") { // dynamic page + $roscms_pagename_file=$result_page['page_name']."_".$query_page_dynamic_ cont_id; // add the dynamic page number to the filename + } + + if ($rpm_debug != "yes") { + // Add correct links: + $query_page_link = mysql_query("SELECT * + FROM pages + WHERE page_visible != 0 AND page_active = '1' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') + ORDER BY 'page_name' ASC") ; + while($result_page_link = mysql_fetch_array($query_page_link)) { // Pages + + if ($result_page_link['pages_extra']=="dynamic") { // dynamic page + //echo "<br><br>--222Dynamic--"; + $query_page_dynamic_link = mysql_query("SELECT * + FROM `dyn_content` + WHERE 1 AND `dyn_content_nr` = 1 AND `dyn_content_active` = 1 AND `dyn_content_visible` = 1"); + } + else { + //echo "<br><br>--222NOTDynamic--"; + $query_page_dynamic_link = mysql_query("SELECT * + FROM `pages` + WHERE 1 AND `page_id` = $current_pageid LIMIT 1 "); // temp + } + + while($result_page_dynamic_link = mysql_fetch_array($query_page_dynamic_link)) { // Pages Dynamic + if ($result_page_link['pages_extra']=="dynamic") { // dynamic page + $roscms_pagename=$result_page_link['page_name']."_".$result_page_dynamic _link['dyn_content_id']; // add the dynamic page number to the filename + } + else { + $roscms_pagename=$result_page_link['page_name']; + } + //echo "<br><br>".$roscms_pagename."<br>"; + if ($w3cformat=="html") { + // replace HTML tags with valid HTML 4.01 tags: + $data_page = str_replace("<br />","<br>",$data_page); // current page version + $data_page = str_replace(" />",">",$data_page); // current page version + + // replace links: + if ($rpm_site != "" && $rpm_sec2=="view") { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag e&sec=generator&sec2=view&site=".$roscms_pagename."&lang =".$myrow_lang[0]."&forma=".$w3cformat."&skin=".$rpm_skin,$data_ page); // correct link + } + else { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$ roscms_pagename.".".$fileformat,$data_page); // correct link + } + //echo " HTML: [#link_".$result_page_link['page_name']."]<br>"; + } + else if ($w3cformat=="xhtml") { + // replace HTML 4.01 tags with valid XHTML tags: + $data_page = str_replace("<br>","<br />",$data_page); // current page version + //$data_page = preg_replace("/<img(.*)>/sU","<img\\1/>",$data_page); // current page version + + // replace links: + if ($rpm_site != "" && $rpm_sec2=="view") { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag e&sec=generator&sec2=view&site=".$roscms_pagename."&lang =".$myrow_lang[0]."&forma=".$w3cformat."&skin=".$rpm_skin,$data_ page); // correct link + } + else { + $data_page = str_replace("[#link_".$roscms_pagename."]", $roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/". $roscms_pagename.".".$fileformat,$data_page); // correct link + } + //echo " XHTML: [#link_".$result_page_link['page_name']."]<br>"; + } + } + } + } + + // redirect all bad links to the frontpage: + $data_page = str_replace("[#link_",$roscms_intern_path_server."?page=index&temp=" ,$data_page); // correct link + + // Output & View: [truncated at 1000 lines; 7342 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs