Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[hpoussin] 22116: Remember custom paths entered in wizard

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue May 30 14:13:47 2006 New Revision: 22116 URL: http://svn.reactos.ru/svn/reactos?rev=22116&view=rev Log: Remember custom paths entered in wizard Modified: trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Tue May 30 14:13:47 2006 @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define YDEBUG #include "newdev_private.h" WINE_DEFAULT_DEBUG_CHANNEL(newdev); @@ -385,6 +384,7 @@ TRACE("RegQueryValueEx() failed with error 0x%lx\n", rc); goto cleanup; } + /* Allocate enough space to add 2 NULL chars at the end of the string */ Buffer = HeapAlloc(GetProcessHeap(), 0, dwPathLength + 2 * sizeof(TCHAR)); if (!Buffer) @@ -407,9 +407,12 @@ Buffer[dwPathLength] = Buffer[dwPathLength + 1] = '\0'; /* Populate combo box */ - for (Path = Buffer; *Path; Path += _tcslen(Path)) + for (Path = Buffer; *Path; Path += _tcslen(Path) + 1) + { (void)ComboBox_AddString(hwndCombo, Path); - (void)ComboBox_SetCurSel(hwndCombo, 0); + if (Path == Buffer) + (void)ComboBox_SetCurSel(hwndCombo, 0); + } cleanup: if (hKey != NULL) @@ -421,7 +424,110 @@ SaveCustomPath( IN HWND hwndCombo) { - FIXME("Stub\n"); + LPTSTR CustomPath = NULL; + DWORD CustomPathLength; + LPTSTR Buffer = NULL; + LPTSTR pBuffer; /* Pointer into Buffer */ + int ItemsCount, Length; + DWORD i; + DWORD TotalLength = 0; + BOOL UseCustomPath = TRUE; + HKEY hKey = NULL; + LONG rc; + + /* Get custom path */ + Length = ComboBox_GetTextLength(hwndCombo) + 1; + CustomPath = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(TCHAR)); + if (!CustomPath) + { + TRACE("HeapAlloc() failed\n"); + goto cleanup; + } + CustomPathLength = ComboBox_GetText(hwndCombo, CustomPath, Length) + 1; + + /* Calculate length of the buffer */ + ItemsCount = ComboBox_GetCount(hwndCombo); + if (ItemsCount == CB_ERR) + { + TRACE("ComboBox_GetCount() failed\n"); + goto cleanup; + } + for (i = 0; i < ItemsCount; i++) + { + Length = ComboBox_GetLBTextLen(hwndCombo, i); + if (Length == CB_ERR) + { + TRACE("ComboBox_GetLBTextLen() failed\n"); + goto cleanup; + } + TotalLength += Length + 1; + } + TotalLength++; /* Final NULL char */ + + /* Allocate buffer */ + Buffer = HeapAlloc(GetProcessHeap(), 0, (CustomPathLength + TotalLength + 1) * sizeof(TCHAR)); + if (!Buffer) + { + TRACE("HeapAlloc() failed\n"); + goto cleanup; + } + + /* Fill the buffer */ + pBuffer = &Buffer[CustomPathLength]; + for (i = 0; i < ItemsCount; i++) + { + Length = ComboBox_GetLBText(hwndCombo, i, pBuffer); + if (Length == CB_ERR) + { + TRACE("ComboBox_GetLBText() failed\n"); + goto cleanup; + } + else if (UseCustomPath && _tcsicmp(CustomPath, pBuffer) == 0) + UseCustomPath = FALSE; + pBuffer += 1 + Length; + } + *pBuffer = '\0'; /* Add final NULL char */ + + if (!UseCustomPath) + { + /* Nothing to save to registry */ + goto cleanup; + } + + TotalLength += CustomPathLength; + _tcscpy(Buffer, CustomPath); + + /* Save the buffer */ + /* RegSetKeyValue would have been better... */ + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + REGSTR_PATH_SETUP REGSTR_KEY_SETUP, + 0, + KEY_SET_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + { + TRACE("RegOpenKeyEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueEx( + hKey, + _T("Installation Sources"), + 0, + REG_MULTI_SZ, + (const BYTE*)Buffer, + TotalLength * sizeof(TCHAR)); + if (rc != ERROR_SUCCESS) + { + TRACE("RegSetValueEx() failed with error 0x%lx\n", rc); + goto cleanup; + } + +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, CustomPath); + HeapFree(GetProcessHeap(), 0, Buffer); } static INT_PTR CALLBACK

18 years, 3 months

[jimtabor] 22115: Implement NtGdiGetCharABCWidths. Not sure if the math is right. Tested with Lazarus IDE. It is completely based on Filip Navara work on NtGdiGetCharWidth32.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue May 30 10:50:03 2006 New Revision: 22115 URL: http://svn.reactos.ru/svn/reactos?rev=22115&view=rev Log: Implement NtGdiGetCharABCWidths. Not sure if the math is right. Tested with Lazarus IDE. It is completely based on Filip Navara work on NtGdiGetCharWidth32. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue May 30 10:50:03 2006 @@ -1973,8 +1973,118 @@ UINT LastChar, LPABC abc) { - DPRINT1("NtGdiGetCharABCWidths Is unimplemented, keep going anyway\n"); - return 1; + LPABC SafeBuffer; + PDC dc; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + FT_Face face; + FT_CharMap charmap, found = NULL; + UINT i, glyph_index, BufferSize; + HFONT hFont = 0; + NTSTATUS Status; + + if (LastChar < FirstChar) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + BufferSize = (LastChar - FirstChar + 1) * sizeof(ABC); + SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); + if (SafeBuffer == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + ExFreePool(SafeBuffer); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + hFont = dc->w.hFont; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + + if (TextObj == NULL) + { + ExFreePool(SafeBuffer); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + + face = FontGDI->face; + if (face->charmap == NULL) + { + for (i = 0; i < face->num_charmaps; i++) + { + charmap = face->charmaps[i]; + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + ExFreePool(SafeBuffer); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + IntLockFreeType; + FT_Set_Charmap(face, found); + IntUnLockFreeType; + } + + IntLockFreeType; + FT_Set_Pixel_Sizes(face, + TextObj->logfont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : + TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + + for (i = FirstChar; i <= LastChar; i++) + { + int adv, lsb, bbx, left, right; + + glyph_index = FT_Get_Char_Index(face, i); + FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + + left = (INT)face->glyph->metrics.horiBearingX & -64; + right = (INT)((face->glyph->metrics.horiBearingX + face->glyph->metrics.width) + 63) & -64; + adv = (face->glyph->advance.x + 32) >> 6; + +// int test = (INT)(face->glyph->metrics.horiAdvance + 63) >> 6; +// DPRINT1("Advance Wine %d and Advance Ros %d\n",test, adv ); /* It's the same!*/ + + lsb = left >> 6; + bbx = (right - left) >> 6; +/* + DPRINT1("lsb %d and bbx %d\n", lsb, bbx ); + */ + SafeBuffer[i - FirstChar].abcA = lsb; + SafeBuffer[i - FirstChar].abcB = bbx; + SafeBuffer[i - FirstChar].abcC = adv - lsb - bbx; + } + IntUnLockFreeType; + TEXTOBJ_UnlockText(TextObj); + Status = MmCopyToCaller(abc, SafeBuffer, BufferSize); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + ExFreePool(SafeBuffer); + return FALSE; + } + ExFreePool(SafeBuffer); + DPRINT("NtGdiGetCharABCWidths Worked!\n"); + return TRUE; } BOOL

18 years, 3 months

[frik85] 22114: RSDB update: * SQL file

by frik85＠svn.reactos.org

Author: frik85 Date: Mon May 29 21:47:53 2006 New Revision: 22114 URL: http://svn.reactos.ru/svn/reactos?rev=22114&view=rev Log: RSDB update: * SQL file Added: trunk/web/reactos.org/sql/rsdb.sql Added: trunk/web/reactos.org/sql/rsdb.sql URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/sql/rsdb.sql?rev=22… ============================================================================== --- trunk/web/reactos.org/sql/rsdb.sql (added) +++ trunk/web/reactos.org/sql/rsdb.sql Mon May 29 21:47:53 2006 @@ -1,0 +1,353 @@ +ï»¿-- +-- Database: `rsdb` +-- + +-- -------------------------------------------------------- + +-- +-- `rsdb_categories` +-- + +CREATE TABLE `rsdb_categories` ( + `cat_id` bigint(20) NOT NULL auto_increment COMMENT 'Category ID', + `cat_name` varchar(100) collate utf8_unicode_ci NOT NULL default '' COMMENT 'Category Name', + `cat_visible` char(1) collate utf8_unicode_ci NOT NULL default '1' COMMENT 'Category Visibility (0/1)', + `cat_description` varchar(255) collate utf8_unicode_ci NOT NULL default '' COMMENT 'Category Description', + `cat_path` bigint(20) NOT NULL default '0' COMMENT 'Category Path-Parent (tree)', + `cat_order` int(11) NOT NULL default '0' COMMENT 'Category Order (for Dev Network)', + `cat_viewcounter` bigint(20) NOT NULL default '0' COMMENT 'Category User Click Counter', + `cat_icon` varchar(100) collate utf8_unicode_ci NOT NULL default '' COMMENT 'Category Icon (optional)', + `cat_comp` char(1) collate utf8_unicode_ci NOT NULL default '1' COMMENT 'Category Compatibility View (0/1)', + `cat_pack` char(1) collate utf8_unicode_ci NOT NULL default '1' COMMENT 'Category Packages View (0/1)', + `cat_devnet` char(1) collate utf8_unicode_ci NOT NULL default '0' COMMENT 'Category Developer Network View (0/1)', + `cat_media` char(1) collate utf8_unicode_ci NOT NULL default '0' COMMENT 'Category Media View (0/1)', + PRIMARY KEY (`cat_id`), + KEY `cat_order` (`cat_order`), + KEY `cat_name` (`cat_name`), + KEY `cat_name_2` (`cat_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Categories'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_group_bundles` +-- + +CREATE TABLE `rsdb_group_bundles` ( + `bundle_id` bigint(20) NOT NULL default '0', + `bundle_groupid` bigint(20) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Group Bundles'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_groups` +-- + +CREATE TABLE `rsdb_groups` ( + `grpentr_id` bigint(20) NOT NULL auto_increment, + `grpentr_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `grpentr_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `grpentr_category` bigint(20) NOT NULL default '0', + `grpentr_type` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', + `grpentr_vendor` bigint(20) NOT NULL default '0', + `grpentr_pic` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `grpentr_viewcounter` bigint(20) NOT NULL default '0', + `grpentr_order` int(11) NOT NULL default '0', + `grpentr_icon` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `grpentr_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `grpentr_comp` char(1) collate utf8_unicode_ci NOT NULL default '1', + `grpentr_pack` char(1) collate utf8_unicode_ci NOT NULL default '0', + `grpentr_devnet` char(1) collate utf8_unicode_ci NOT NULL default '0', + `grpentr_media` char(1) collate utf8_unicode_ci NOT NULL default '0', + `grpentr_usrid` bigint(20) NOT NULL default '0', + `grpentr_date` datetime NOT NULL default '0000-00-00 00:00:00', + `grpentr_checked` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + PRIMARY KEY (`grpentr_id`), + KEY `grpentr_name` (`grpentr_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Group Entries'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_comp` +-- + +CREATE TABLE `rsdb_item_comp` ( + `comp_id` bigint(20) NOT NULL auto_increment, + `comp_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `comp_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `comp_groupid` bigint(20) NOT NULL default '0', + `comp_viewcounter` bigint(20) NOT NULL default '0', + `comp_appversion` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `comp_osversion` varchar(6) collate utf8_unicode_ci NOT NULL default '000000', + `comp_status` tinyint(4) NOT NULL default '0', + `comp_rosversion` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `comp_rosrevision` bigint(20) NOT NULL default '0', + `comp_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `comp_media` bigint(20) NOT NULL default '0' COMMENT 'Screenshots', + `comp_infotext` text collate utf8_unicode_ci NOT NULL, + `comp_award` smallint(6) NOT NULL default '0', + `comp_usrid` bigint(20) NOT NULL default '0', + `comp_date` datetime NOT NULL default '0000-00-00 00:00:00', + `comp_checked` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + PRIMARY KEY (`comp_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Compatibility'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_comp_forum` +-- + +CREATE TABLE `rsdb_item_comp_forum` ( + `fmsg_id` bigint(20) NOT NULL auto_increment, + `fmsg_comp_id` bigint(20) NOT NULL default '0', + `fmsg_parent` bigint(20) NOT NULL default '0', + `fmsg_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `fmsg_subject` varchar(250) collate utf8_unicode_ci NOT NULL default '', + `fmsg_body` text collate utf8_unicode_ci NOT NULL, + `fmsg_user_id` bigint(20) NOT NULL default '0', + `fmsg_user_ip` varchar(250) collate utf8_unicode_ci NOT NULL default '', + `fmsg_date` datetime NOT NULL default '0000-00-00 00:00:00', + `fmsg_useful_vote_value` int(11) NOT NULL default '0', + `fmsg_useful_vote_user` int(11) NOT NULL default '0', + `fmsg_useful_vote_user_history` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`fmsg_id`), + KEY `item_id` (`fmsg_comp_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Compatibility Forum'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_comp_testresults` +-- + +CREATE TABLE `rsdb_item_comp_testresults` ( + `test_id` bigint(20) NOT NULL auto_increment, + `test_comp_id` bigint(20) NOT NULL default '0', + `test_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `test_com_version` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `test_comp_revision` int(11) NOT NULL default '0', + `test_whatworks` text collate utf8_unicode_ci NOT NULL, + `test_whatdoesntwork` text collate utf8_unicode_ci NOT NULL, + `test_whatnottested` text collate utf8_unicode_ci NOT NULL, + `test_date` datetime NOT NULL default '0000-00-00 00:00:00', + `test_result_install` tinyint(4) NOT NULL default '0', + `test_result_function` tinyint(4) NOT NULL default '0', + `test_user_comment` text collate utf8_unicode_ci NOT NULL, + `test_conclusion` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `test_user_id` bigint(20) NOT NULL default '0', + `test_user_submit_timestamp` timestamp NULL default CURRENT_TIMESTAMP, + `test_useful_vote_value` int(11) NOT NULL default '0', + `test_useful_vote_user` int(11) NOT NULL default '0', + `test_useful_vote_user_history` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`test_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Compatibility Test Results'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_devnet` +-- + +CREATE TABLE `rsdb_item_devnet` ( + `devnet_id` bigint(20) NOT NULL auto_increment, + `devnet_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `devnet_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `devnet_groupid` bigint(20) NOT NULL default '0', + `devnet_viewcounter` bigint(20) NOT NULL default '0', + `devnet_order` int(11) NOT NULL default '0', + `devnet_version` int(11) NOT NULL default '0', + `devnet_description` text collate utf8_unicode_ci NOT NULL, + `devnet_text` longtext collate utf8_unicode_ci NOT NULL, + `devnet_osversions` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`devnet_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Developer Network Entries'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_pack` +-- + +CREATE TABLE `rsdb_item_pack` ( + `pack_id` bigint(20) NOT NULL auto_increment, + `pack_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `pack_shortname` varchar(15) collate utf8_unicode_ci NOT NULL default '', + `pack_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `pack_groupid` bigint(20) NOT NULL default '0', + `pack_viewcounter` bigint(20) NOT NULL default '0', + `pack_appversion` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `pack_packmgrversion` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `pack_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`pack_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Packages'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_item_vendor` +-- + +CREATE TABLE `rsdb_item_vendor` ( + `vendor_id` bigint(20) NOT NULL auto_increment, + `vendor_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `vendor_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `vendor_fullname` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `vendor_url` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `vendor_email` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `vendor_infotext` text collate utf8_unicode_ci NOT NULL, + `vendor_problem` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `vendor_usrid` bigint(20) NOT NULL default '0', + `vendor_usrip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `vendor_date` datetime NOT NULL default '0000-00-00 00:00:00', + `vendor_checked` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + PRIMARY KEY (`vendor_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Vendor Information'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_languages` +-- + +CREATE TABLE `rsdb_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'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_logs` +-- + +CREATE TABLE `rsdb_logs` ( + `log_id` bigint(20) NOT NULL auto_increment, + `log_date` datetime NOT NULL default '0000-00-00 00:00:00', + `log_usrid` bigint(20) NOT NULL default '0', + `log_usrip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `log_level` varchar(10) collate utf8_unicode_ci NOT NULL default 'high', + `log_action` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `log_title` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `log_description` text collate utf8_unicode_ci NOT NULL, + `log_category` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `log_badusr` bigint(20) NOT NULL default '0', + `log_referrer` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `log_browseragent` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `log_read` text collate utf8_unicode_ci NOT NULL, + `log_taskdone_usr` bigint(20) NOT NULL default '0', + PRIMARY KEY (`log_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RSDB Logs'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_object_description` +-- + +CREATE TABLE `rsdb_object_description` ( + `desc_id` bigint(20) NOT NULL default '0', + `desc_visible` char(1) collate utf8_unicode_ci NOT NULL default '', + `desc_text` text collate utf8_unicode_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RSDB Object "Description"'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_object_media` +-- + +CREATE TABLE `rsdb_object_media` ( + `media_id` bigint(20) NOT NULL auto_increment, + `media_groupid` bigint(20) NOT NULL default '0', + `media_visible` char(1) collate utf8_unicode_ci NOT NULL default '1', + `media_order` int(11) NOT NULL default '0', + `media_file` varchar(250) collate utf8_unicode_ci NOT NULL default '', + `media_filetype` varchar(50) collate utf8_unicode_ci NOT NULL default 'picture', + `media_thumbnail` varchar(250) collate utf8_unicode_ci NOT NULL default '', + `media_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `media_exif` text collate utf8_unicode_ci NOT NULL, + `media_date` datetime NOT NULL default '0000-00-00 00:00:00', + `media_user_id` bigint(20) NOT NULL default '0', + `media_user_ip` varchar(250) collate utf8_unicode_ci NOT NULL default '', + `media_useful_vote_value` int(11) NOT NULL default '0', + `media_useful_vote_user` int(11) NOT NULL default '0', + `media_useful_vote_user_history` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`media_id`), + KEY `media_groupid` (`media_groupid`), + KEY `media_filetype` (`media_filetype`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Media Files'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_object_osversions` +-- + +CREATE TABLE `rsdb_object_osversions` ( + `ver_id` int(11) NOT NULL auto_increment, + `ver_name` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `ver_value` varchar(6) collate utf8_unicode_ci NOT NULL default '', + `ver_visible` char(1) collate utf8_unicode_ci NOT NULL default '0', + PRIMARY KEY (`ver_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Operating System Version Numbers'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_stats` +-- + +CREATE TABLE `rsdb_stats` ( + `stat_date` date NOT NULL default '0000-00-00' COMMENT 'Date', + `stat_pviews` int(11) NOT NULL default '0' COMMENT 'Page Views', + `stat_visitors` int(11) NOT NULL default '0' COMMENT 'Visitors', + `stat_users` int(11) NOT NULL default '0' COMMENT 'Registered Users', + `stat_s_cat` int(11) NOT NULL default '0' COMMENT 'Submit Categories', + `stat_s_grp` int(11) NOT NULL default '0' COMMENT 'Submit Groups', + `stat_s_icomp` int(11) NOT NULL default '0' COMMENT 'Submit Comp-Items', + `stat_s_ictest` int(11) NOT NULL default '0' COMMENT 'Submit Comp-Tests', + `stat_s_icbb` int(11) NOT NULL default '0' COMMENT 'Submit Comp-Forum-entries', + `stat_s_icvotes` int(11) NOT NULL default '0' COMMENT 'Submit Comp votes', + `stat_s_media` int(11) NOT NULL default '0' COMMENT 'Submit Media', + `stat_s_votes` int(11) NOT NULL default '0' COMMENT 'Submit Votes Total', + `stat_vislst` text collate utf8_unicode_ci NOT NULL COMMENT 'Visitors List', + `stat_usrlst` text collate utf8_unicode_ci NOT NULL COMMENT 'User ID List', + `stat_brow_IE` int(11) NOT NULL default '0' COMMENT 'IE counter', + `stat_brow_MOZ` int(11) NOT NULL default '0' COMMENT 'Mozilla counter', + `stat_brow_OPERA` int(11) NOT NULL default '0' COMMENT 'Opera counter', + `stat_brow_KHTML` int(11) NOT NULL default '0', + `stat_brow_text` int(11) NOT NULL default '0', + `stat_brow_other` int(11) NOT NULL default '0', + `stat_os_winnt` int(11) NOT NULL default '0', + `stat_os_ros` int(11) NOT NULL default '0', + `stat_os_unix` int(11) NOT NULL default '0', + `stat_os_bsd` int(11) NOT NULL default '0', + `stat_os_linux` int(11) NOT NULL default '0', + `stat_os_mac` int(11) NOT NULL default '0', + `stat_os_other` int(11) NOT NULL default '0', + `stat_reflst` text collate utf8_unicode_ci NOT NULL COMMENT 'Referrers list', + PRIMARY KEY (`stat_date`), + UNIQUE KEY `stat_date` (`stat_date`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RSDB Stats'; + +-- -------------------------------------------------------- + +-- +-- `rsdb_urls` +-- + +CREATE TABLE `rsdb_urls` ( + `url_id` bigint(20) NOT NULL auto_increment, + `url_t` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `url_u` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `url_a` bigint(20) NOT NULL default '0', + `url_i` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `url_s` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `url_lang` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `url_browser` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`url_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='URL logs';

18 years, 3 months

[gedmurphy] 22113: change version number for 0.3.0 release

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon May 29 20:21:21 2006 New Revision: 22113 URL: http://svn.reactos.ru/svn/reactos?rev=22113&view=rev Log: change version number for 0.3.0 release Modified: branches/ros-branch-0_3_0/reactos/base/shell/explorer/res/logov.bmp Modified: branches/ros-branch-0_3_0/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/base/sh… ============================================================================== Binary files - no diff available.

18 years, 3 months

[gedmurphy] 22112: change version text in line with new svn version

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon May 29 20:20:45 2006 New Revision: 22112 URL: http://svn.reactos.ru/svn/reactos?rev=22112&view=rev Log: change version text in line with new svn version Modified: trunk/reactos/base/shell/explorer/res/logov.bmp Modified: trunk/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/res/log… ============================================================================== Binary files - no diff available.

18 years, 3 months

[frik85] 22111: RSDB & RosCMS update: * update text files

by frik85＠svn.reactos.org

Author: frik85 Date: Mon May 29 18:07:10 2006 New Revision: 22111 URL: http://svn.reactos.ru/svn/reactos?rev=22111&view=rev Log: RSDB & RosCMS update: * update text files Added: trunk/web/reactos.org/htdocs/support/COPYING.txt trunk/web/reactos.org/htdocs/support/CREDITS.txt trunk/web/reactos.org/htdocs/support/README.txt Modified: trunk/web/reactos.org/htdocs/roscms/README.txt Modified: trunk/web/reactos.org/htdocs/roscms/README.txt URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/READM… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/README.txt (original) +++ trunk/web/reactos.org/htdocs/roscms/README.txt Mon May 29 18:07:10 2006 @@ -1,6 +1,6 @@ ================================= ReactOS Content Management System -Updated November 15th, 2005 +Updated May 29th, 2006 ================================= 1. What is RosCMS? @@ -17,22 +17,12 @@ More information is available at: http://www.reactos.org -2. Building ReactOS - -See the INSTALL file for more details. - - -3. More information - -See the ReactOS Wiki at: http://www.reactos.org/wiki/ - - -4. Who is responsible? +2. Who is responsible? See the CREDITS.txt file -5. What is the license? +3. What is the license? See the COPYING.txt file Added: trunk/web/reactos.org/htdocs/support/COPYING.txt URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/COPY… ============================================================================== --- trunk/web/reactos.org/htdocs/support/COPYING.txt (added) +++ trunk/web/reactos.org/htdocs/support/COPYING.txt Mon May 29 18:07:10 2006 @@ -1,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: trunk/web/reactos.org/htdocs/support/CREDITS.txt URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/CRED… ============================================================================== --- trunk/web/reactos.org/htdocs/support/CREDITS.txt (added) +++ trunk/web/reactos.org/htdocs/support/CREDITS.txt Mon May 29 18:07:10 2006 @@ -1,0 +1,4 @@ +ReactOS Support Database is available thanks to the work of + + +Klemens Friedl <frik85(a)reactos.org> Added: trunk/web/reactos.org/htdocs/support/README.txt URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/READ… ============================================================================== --- trunk/web/reactos.org/htdocs/support/README.txt (added) +++ trunk/web/reactos.org/htdocs/support/README.txt Mon May 29 18:07:10 2006 @@ -1,0 +1,23 @@ +================================= +ReactOS Support Database +Updated May 29th, 2006 +================================= + +1. What is RSDB? + + RSDB, the abbreviation of ReactOS Support Database, +is an an Open Source effort to develop a Support Database +System that is simple, fast, unified, easy-to-use and flexible. + +More information is available at: http://www.reactos.org/support/ + + +2. Who is responsible? + +See the CREDITS.txt file + + +3. What is the license? + +See the COPYING.txt file +

18 years, 3 months

[frik85] 22110: RosCMS update: * interface improvements * translator interface update * myReactOS interface cleanup * improved page generator (new features) * ...

by frik85＠svn.reactos.org

Author: frik85 Date: Mon May 29 17:38:13 2006 New Revision: 22110 URL: http://svn.reactos.ru/svn/reactos?rev=22110&view=rev Log: RosCMS update: * interface improvements * translator interface update * myReactOS interface cleanup * improved page generator (new features) * ... Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_user.php trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php trunk/web/reactos.org/htdocs/roscms/index.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php Mon May 29 17:38:13 2006 @@ -287,6 +287,22 @@ echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=all">'.$roscms_langres['ContTrans_All'].'</a>'; } echo ' | '; + if ($rpm_lang_id == "layout") { + echo '<b>Layout</b>'; + $ros_cms_intern_content_lang = "AND content_type = 'layout'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=layout">Layout</a>'; + } + echo ' | '; + if ($rpm_lang_id == "error") { + echo '<b>Error</b>'; + $ros_cms_intern_content_lang = "AND content_type != 'default' AND content_type != 'layout'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=error">Error</a>'; + } + echo ' | '; } if ($rpm_lang_id == "nolang") { @@ -304,6 +320,14 @@ else { echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=nolang">'.$roscms_langres['ContTrans_International'].'</a>'; } + + $sql_lang_usr="SELECT * + FROM users + WHERE user_id = '".mysql_escape_string($roscms_intern_account_id)."' + LIMIT 1 ;"; + $sql_query_lang_usr=mysql_query($sql_lang_usr); + $myrow_lang_usr=mysql_fetch_array($sql_query_lang_usr); + // Languages $sql_lang="SELECT * FROM languages @@ -317,13 +341,15 @@ } } $roscms_sel_lang = $myrow_lang[0]; - echo ' | '; - if ($rpm_lang_id == $roscms_sel_lang) { - echo '<b>'.$myrow_lang[1].'</b>'; - $ros_cms_intern_content_lang = "AND content_lang = '".$roscms_sel_lang."'"; - } - else { - echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$roscms_sel_lang.'">'.$myrow_lang[1].'</a>'; + if ( ($roscms_sel_lang == $myrow_lang_usr['user_language'] && $rpm_page == "trans") || $rpm_page == "team" || $rpm_page == "dev" || $rpm_page == "admin") { + echo ' | '; + if ($rpm_lang_id == $roscms_sel_lang) { + echo '<b>'.$myrow_lang[1].'</b>'; + $ros_cms_intern_content_lang = "AND content_lang = '".$roscms_sel_lang."'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$roscms_sel_lang.'">'.$myrow_lang[1].'</a>'; + } } } @@ -597,6 +623,7 @@ else if ($result_content['content_lang'] != "all") { echo $result_content['content_lang']; } + echo '<br /><font size="1">'.$result_content['content_type'].'</font>'; ?> </font></div></td> <td width="26%" valign="middle" bgcolor="<?php echo $farbe; ?>" title="<?php @@ -605,12 +632,12 @@ ?>"> <pre><font face="Arial, Helvetica, sans-serif"><?php echo substr(htmlentities($result_content['content_text'], ENT_QUOTES), 0, 40)."..." ; ?></font></pre> </td> - <td width="7%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="right"><font face="Arial, Helvetica, sans-serif"> + <td width="7%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php - echo '<b><a href="?page='.$rpm_page.'&sec=content&sec2=view&diff='.$result_content['content_id'].'">'.$result_content['content_version'].'</a></b>'; + echo '<b>'.$result_content['content_version'].'</b><br /><a href="?page='.$rpm_page.'&sec=content&sec2=view&diff='.$result_content['content_id'].'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id.'"><i>Diff-Tool</i></a>'; ?> </font></div> - <div align="center"><font face="Arial, Helvetica, sans-serif"> </font></div></td> + <div align="center"><font face="Arial, Helvetica, sans-serif"> </font></div></td> <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php echo $result_content['content_date']." ".$result_content['content_time'];; Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Mon May 29 17:38:13 2006 @@ -109,20 +109,40 @@ <optgroup label="languages"> <?php if ($rpm_page != "trans") { -?> - <option value="all"<?php if ($cmsros_intern_temp_lang_short == "all") { echo ' selected="selected"'; } echo ">".$roscms_langres['ContTrans_All']; ?></option> -<?php - } - - + echo '<option value="all"'; + if ($cmsros_intern_temp_lang_short == "all") { + echo ' selected="selected"'; + } + echo ">".$roscms_langres['ContTrans_All']; + echo "</option>"; + } + + + $sql_lang_usr="SELECT * + FROM users + WHERE user_id = '".mysql_escape_string($roscms_intern_account_id)."' + LIMIT 1 ;"; + $sql_query_lang_usr=mysql_query($sql_lang_usr); + $myrow_lang_usr=mysql_fetch_array($sql_query_lang_usr); + // Languages - $sql_langa="SELECT * - FROM languages - WHERE lang_level != '0' - ORDER BY 'lang_level' DESC"; - $sql_query_langa=mysql_query($sql_langa); + if ($rpm_page == "trans") { + $sql_langa="SELECT * + FROM languages + WHERE lang_level != '0' + AND lang_id = '".mysql_escape_string($myrow_lang_usr['user_language'])."' + ORDER BY 'lang_level' DESC"; + $sql_query_langa=mysql_query($sql_langa); + } + else { + $sql_langa="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_langa=mysql_query($sql_langa); + } while($myrow_langa=mysql_fetch_row($sql_query_langa)) { - if ($rpm_page == "trans" && $myrow_langa[0] == "en") { + if ($rpm_page == "trans" && $myrow_langa[0] == "en" && $myrow_lang_usr['user_language'] != "en") { // temp } else { @@ -534,7 +554,7 @@ $result_content_new_revision_preview = mysql_fetch_array($query_content_new_revision_preview); $roscms_TEMP_cont_name = $result_content_new_revision_preview['content_name']; echo "<p>".$roscms_langres['ContTrans_Save1']." '".$result_content_new_revision_preview['content_name']."' (old id='".$rpm_db_id."', new id='". $result_content_new_revision_preview["content_id"] ."') ".$roscms_langres['ContTrans_Save2']."</p>"; - echo "<p><a href='?page=". $rpm_page ."&sec=content&sec2=edit&sort=". $rpm_sort ."&filt=". $rpm_filt ."&langid=". $rpm_lang_id ."&db_id=". $result_content_new_revision_preview['content_id'] ."'>".$roscms_langres['ContTrans_Save3']." (revision ". $result_content_new_revision_preview["content_id"] .")</a></p>"; + echo "<p><b><a href='?page=". $rpm_page ."&sec=content&sec2=edit&sort=". $rpm_sort ."&filt=". $rpm_filt ."&langid=". $rpm_lang_id ."&db_id=". $result_content_new_revision_preview['content_id'] ."'>".$roscms_langres['ContTrans_Save3']."</b> (revision ". $result_content_new_revision_preview["content_id"] .")</a></p>"; echo "<p><a href='".$_SERVER['HTTP_REFERER']."'>".$roscms_langres['ContTrans_Save4']." (revision ". $result_content['content_id'] .")</a></p>"; echo "<p> </p><p><fieldset><legend>".$roscms_langres['ContTrans_Preview']."</legend><br>".$result_content_new_revision_preview['content_text']."</fieldset></p>"; } Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php Mon May 29 17:38:13 2006 @@ -44,7 +44,20 @@ </tr> <tr> <td><div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td><font face="Arial, Helvetica, sans-serif"><a href="?page=<?php echo $rpm_page; ?>&sec=generator&sec2=output" title="Generate all static pages (only if you need to update all pages, e.g. one time per day)"><strong><?php echo $roscms_langres['ContTrans_Gen_menu2']; ?></strong></a> </font></td> + <td><font face="Arial, Helvetica, sans-serif"><a href="?page=<?php echo $rpm_page; ?>&sec=generator&sec2=output" title="Generate all static pages (only if you need to update all pages, e.g. one time per day)"><strong><?php echo $roscms_langres['ContTrans_Gen_menu2']; ?></strong></a> <?php + + + // Languages + $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)) { + echo ', <a href="?page='.$rpm_page.'&sec=generator&sec2=output&gen_lang='.$myrow_lang[0].'&skin=default">'.$myrow_lang[1].'</a>'; + } + + ?></font></td> <td> </td> <td><div align="center"><img src="images/dot.gif" vspace="3"></div></td> <td><font face="Arial, Helvetica, sans-serif"><a href="?page=<?php echo $rpm_page; ?>&sec=generator&sec2=view&site=&lang=en&forma=xhtml&skin=default" title="Don't use this function if you don't know what this function do!">View all pages - test mode</a></font></td> @@ -361,17 +374,17 @@ ?> </font></strong></div> <div align="center"><strong><font face="Arial, Helvetica, sans-serif"> </font></strong></div></td> - <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><strong><font face="Arial, Helvetica, sans-serif"> + <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php echo $result_page['page_date']." ".$result_page['page_time'];; ?> - </font></strong></div></td> + </font></div></td> <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> - <div align="center"><strong><font face="Arial, Helvetica, sans-serif"> + <div align="center"><font face="Arial, Helvetica, sans-serif"> <?php echo "<b>".date("Y-m-d",$result_page['page_generate_timestamp'])."</b><br>".date("H:i:s",$result_page['page_generate_timestamp']); ?> - </font></strong></div></td> + </font></div></td> <td width="23%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><strong><font face="Arial, Helvetica, sans-serif"> <?php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/g… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Mon May 29 17:38:13 2006 @@ -64,6 +64,14 @@ set_time_limit(0); + $rpm_gen_lang=""; + if (array_key_exists("gen_lang", $_GET)) $rpm_gen_lang=htmlspecialchars($_GET["gen_lang"]); + if ($rpm_gen_lang != "") { + $rpm_temp_gen_lang = " AND lang_id = '".mysql_escape_string($rpm_gen_lang)."'"; + } + else { + $rpm_temp_gen_lang = ""; + } //include("db/connect_db.inc.php"); // database connection script @@ -129,20 +137,20 @@ if ($rpm_site != "" && $rpm_sec2=="view") { $sql_lang="SELECT * FROM languages - WHERE lang_level != '0' AND lang_id = '$rpm_lang' + WHERE lang_level != '0' AND lang_id = '".mysql_escape_string($rpm_lang)."' ORDER BY 'lang_level' DESC"; -// echo "<br>".$rpm_lang; + //echo "<br>!!".$rpm_lang; } else if ($rpm_site != "" && $rpm_sec2=="genpage") { $sql_lang="SELECT * FROM languages - WHERE lang_level != '0' + WHERE lang_level != '0' ".$rpm_temp_gen_lang." ORDER BY 'lang_level' DESC"; } else { $sql_lang="SELECT * FROM languages - WHERE lang_level != '0' + WHERE lang_level != '0' ".$rpm_temp_gen_lang." ORDER BY 'lang_level' DESC"; } $sql_query_lang=mysql_query($sql_lang); Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_user.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/i… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_user.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_user.php Mon May 29 17:38:13 2006 @@ -21,29 +21,24 @@ <div class="navTitle"><?php echo $roscms_langres['myReactOS']; ?></div> <ol> <li><a href="?page=user"><?php echo $roscms_langres['Overview']; ?></a></li> - <li><a href="?page=user&sec=account"><?php echo $roscms_langres['Account']; ?></a></li> + <li><a href="?page=user&sec=account&sec2=edit"><?php echo $roscms_langres['Account_Edit']; ?></a></li> + <li><a href="?page=user&sec=accountlist"><?php echo $roscms_langres['Accountlist']; ?></a></li> + <li><a href="?page=user&sec=gls"><?php echo $roscms_langres['Login_System']; ?></a></li> <?php - if ($rpm_sec == "account" || $rpm_sec == "gls" || $rpm_sec == "accountlist") { + /* + <li><a href="?page=user&sec=help"><?php echo $roscms_langres['Documentation']; ?></a></li> + */ + if ($roscms_intern_usrgrp_sadmin == true || + $roscms_intern_usrgrp_admin == true || + $roscms_intern_usrgrp_dev == true || + $roscms_intern_usrgrp_team == true || + $roscms_intern_usrgrp_trans == true) + { ?> - <li><a href="?page=user&sec=account&sec2=edit"> - <?php echo $roscms_langres['Account_Edit']; ?></a></li> - <li><a href="?page=user&sec=accountlist"> - <?php echo $roscms_langres['Accountlist']; ?></a></li> - <li><a href="?page=user&sec=gls"> - <?php echo $roscms_langres['Login_System']; ?></a></li> + <li><a href="?page=home">RosCMS Interface</a></li> <?php - } -/* - <li><a href="?page=user&sec=msg"><?php echo $roscms_langres['Messages']; ?></a></li> - <li><a href="?page=user&sec=contact"><?php echo $roscms_langres['Contacts']; ?></a></li> - <li><a href="?page=user&sec=fav"><?php echo $roscms_langres['Favorites']; ?></a></li> */ ?> - <li><a href="?page=user&sec=help"><?php echo $roscms_langres['Documentation']; ?></a></li> - <?php - if ($roscms_intern_usrgrp_sadmin == true || - $roscms_intern_usrgrp_admin == true || - $roscms_intern_usrgrp_dev == true || - $roscms_intern_usrgrp_team == true || - $roscms_intern_usrgrp_trans == true) { - ?> - <li><a href="?page=home">RosCMS Interface</a></li> - <?php } ?> + } +?> </ol> </div> <p></p> Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/u… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php Mon May 29 17:38:13 2006 @@ -18,43 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ ?> -<table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td width="460" colspan="3"><span class="contentSmallTitle"><?php echo $roscms_langres['User_Profil_Overview']; ?></span></td> - </tr> - <tr> - <td colspan="2" bgcolor="#F9F8F8"> <table border="0" cellpadding="4"> - <tr> - <td width="20"> - <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td width="180"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=user&sec=account"><?php echo $roscms_langres['Account']; ?></a> - </font></strong></div></td> - <td width="5"> </td> - <td width="20"> - <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td width="180"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=user&sec=contact"><?php echo $roscms_langres['Contacts']; ?></a></font></strong></td> - </tr> - <tr> - <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="?page=user&sec=gls"><?php echo $roscms_langres['Login_System']; ?></a></font></strong></div></td> - <td> </td> - <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td><strong><font face="Arial, Helvetica, sans-serif"><a href="#"><a href="?page=user&sec=fav"><?php echo $roscms_langres['Favorites']; ?></a></font></strong></td> - </tr> - <tr> - <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="?page=user&sec=msg"><?php echo $roscms_langres['Messages']; ?></a></font></strong></div></td> - <td> </td> - <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td><strong><font face="Arial, Helvetica, sans-serif"><a href="#"><a href="?page=user&sec=help"><?php echo $roscms_langres['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> <table width="460" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="" colspan="3"><span class="contentSmallTitle"><?php echo $roscms_langres['User_Profil']; ?></span></td> @@ -62,7 +25,8 @@ <tr> <td colspan="2" bgcolor="#F9F8F8"><table width="100%" border="0"> <tr> - <td width="135" valign="top"><b><img src="images/userpic_default.jpg" width="124" height="165" border="1"></b></td> + <td width="15 + " valign="top"> </td> <td valign="top"><table width="100%" border="0" cellpadding="4"> <tr> <td width="84" valign="top"><font size="2" face="Arial, Helvetica, sans-serif">Nick:</font></td> @@ -89,7 +53,7 @@ $query_usraccount= mysql_query("SELECT * FROM `users` - WHERE `user_id` = ".$roscms_intern_account_id." LIMIT 0 , 1"); + WHERE `user_id` = ".$roscms_intern_account_id." LIMIT 1 ;"); $result_usraccount=mysql_fetch_array($query_usraccount); echo $result_usraccount['user_fullname']; @@ -128,7 +92,7 @@ <td colspan="2" valign="top"> <font size="2" face="Arial, Helvetica, sans-serif"><?php include("../editor/bbcode/cbparser.php"); - echo bb2html($result_usraccount['user_description'],''); + echo @bb2html($result_usraccount['user_description'],''); ?></font></td> </tr> @@ -139,7 +103,3 @@ <td><img src="images/line.gif" width="1" height="1"></td> </tr> </table> -<div class="contentSmall"><span class="contentSmallTitle"><?php echo $roscms_langres['Account_Information']; ?></span> - <p><?php echo $roscms_langres['Account_Information_description']; ?></p> - <p>This content hasn't been written yet. If you want to write the content for this page, please ask a ReactOS Web Team member or join the #reactos-hp irc channel!</p> -</div> Modified: trunk/web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/index… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/index.php (original) +++ trunk/web/reactos.org/htdocs/roscms/index.php Mon May 29 17:38:13 2006 @@ -37,7 +37,7 @@ * * (c) by Klemens Friedl <frik85> * - */ + */ if ( !defined('ROSCMS_SYSTEM') ) { define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity

18 years, 3 months

[hpoussin] 22109: - Implement SetupCopyOEMInfW - Correctly sort drivers by rank and by date - Fix memory corruption if %SYSTEMROOT% was longer than 128 chars

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 29 17:32:51 2006 New Revision: 22109 URL: http://svn.reactos.ru/svn/reactos?rev=22109&view=rev Log: - Implement SetupCopyOEMInfW - Correctly sort drivers by rank and by date - Fix memory corruption if %SYSTEMROOT% was longer than 128 chars Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Mon May 29 17:32:51 2006 @@ -5486,14 +5486,15 @@ driverInfo->Details.InfFileName[MAX_PATH - 1] = '\0'; /* Fill InfDate field */ - /* FIXME: hFile = CreateFile(driverInfo->Details.InfFileName, + hFile = CreateFile( + InfFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) goto cleanup; Result = GetFileTime(hFile, NULL, NULL, &driverInfo->Details.InfDate); if (!Result) - goto cleanup;*/ + goto cleanup; /* Fill SectionName field */ Result = SetupGetStringFieldW( @@ -5576,10 +5577,10 @@ struct DriverInfoElement *CurrentDriver; CurrentDriver = CONTAINING_RECORD(PreviousEntry, struct DriverInfoElement, ListEntry); if (CurrentDriver->DriverRank > Rank || - (CurrentDriver->DriverRank == Rank && CurrentDriver->DriverDate.QuadPart > driverInfo->DriverDate.QuadPart)) + (CurrentDriver->DriverRank == Rank && CurrentDriver->DriverDate.QuadPart < driverInfo->DriverDate.QuadPart)) { /* Insert before the current item */ - InsertHeadList(PreviousEntry, &driverInfo->ListEntry); + InsertHeadList(PreviousEntry->Blink, &driverInfo->ListEntry); break; } PreviousEntry = PreviousEntry->Flink; @@ -5858,17 +5859,14 @@ static struct InfFileDetails * CreateInfFileDetails( - IN LPCWSTR InfFileName) + IN LPCWSTR FullInfFileName) { struct InfFileDetails *details; PWCHAR last; DWORD Needed; - last = strrchrW(InfFileName, '\\'); Needed = FIELD_OFFSET(struct InfFileDetails, szData) - + strlenW(InfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); - if (last != NULL) - Needed += (last - InfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + strlenW(FullInfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); details = HeapAlloc(GetProcessHeap(), 0, Needed); if (!details) @@ -5878,17 +5876,18 @@ } memset(details, 0, Needed); + strcpyW(details->szData, FullInfFileName); + last = strrchrW(details->szData, '\\'); if (last) { details->DirectoryName = details->szData; - details->FullInfFileName = &details->szData[last - InfFileName + 1]; - strncpyW(details->DirectoryName, InfFileName, last - InfFileName); + details->FileName = last + 1; + *last = '\0'; } else - details->FullInfFileName = details->szData; - strcpyW(details->FullInfFileName, InfFileName); + details->FileName = details->szData; ReferenceInfFile(details); - details->hInf = SetupOpenInfFileW(InfFileName, NULL, INF_STYLE_WIN4, NULL); + details->hInf = SetupOpenInfFileW(FullInfFileName, NULL, INF_STYLE_WIN4, NULL); if (details->hInf == INVALID_HANDLE_VALUE) { HeapFree(GetProcessHeap(), 0, details); @@ -6022,20 +6021,13 @@ LPCWSTR filename; LPWSTR pFullFilename; - if (InstallParams.Flags & DI_ENUMSINGLEINF) - { - FullInfFileName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - if (!FullInfFileName) - goto done; - pFullFilename = &FullInfFileName[0]; - } - else if (*InstallParams.DriverPath) + if (!(InstallParams.Flags & DI_ENUMSINGLEINF) && *InstallParams.DriverPath) { DWORD len; len = GetFullPathNameW(InstallParams.DriverPath, 0, NULL, NULL); if (len == 0) goto done; - FullInfFileName = HeapAlloc(GetProcessHeap(), 0, len + MAX_PATH); + FullInfFileName = HeapAlloc(GetProcessHeap(), 0, (len + 1 + MAX_PATH) * sizeof(WCHAR)); if (!FullInfFileName) goto done; len = GetFullPathNameW(InstallParams.DriverPath, len, FullInfFileName, NULL); @@ -6047,7 +6039,7 @@ } else { - FullInfFileName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + FullInfFileName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if (!FullInfFileName) goto done; pFullFilename = &FullInfFileName[0]; @@ -8048,7 +8040,7 @@ pSectionName = &SectionName[strlenW(SectionName)]; /* Get information from [Version] section */ - if (!SetupDiGetINFClassW(SelectedDriver->InfFileDetails->FullInfFileName, &ClassGuid, ClassName, MAX_CLASS_NAME_LEN, &RequiredSize)) + if (!SetupDiGetINFClassW(SelectedDriver->Details.InfFileName, &ClassGuid, ClassName, MAX_CLASS_NAME_LEN, &RequiredSize)) goto cleanup; /* Format ClassGuid to a string */ if (UuidToStringW((UUID*)&ClassGuid, &lpGuidString) != RPC_S_OK) @@ -8064,6 +8056,35 @@ memcpy(&lpFullGuidString[1], lpGuidString, RequiredSize * sizeof(WCHAR)); lpFullGuidString[RequiredSize + 1] = '}'; lpFullGuidString[RequiredSize + 2] = '\0'; + + /* Copy .inf file to Inf\ directory (if needed) */ + Result = InfIsFromOEMLocation(SelectedDriver->Details.InfFileName, &NeedtoCopyFile); + if (!Result) + goto cleanup; + if (NeedtoCopyFile) + { + WCHAR NewFileName[MAX_PATH]; + struct InfFileDetails *newInfFileDetails; + Result = SetupCopyOEMInfW( + SelectedDriver->Details.InfFileName, + NULL, + SPOST_NONE, + SP_COPY_NOOVERWRITE, + NewFileName, MAX_PATH, + NULL, + NULL); + if (!Result) + goto cleanup; + /* Create a new struct InfFileDetails, and set it to + * SelectedDriver->InfFileDetails, to release use of + * current InfFile */ + newInfFileDetails = CreateInfFileDetails(NewFileName); + if (!newInfFileDetails) + goto cleanup; + DereferenceInfFile(SelectedDriver->InfFileDetails); + SelectedDriver->InfFileDetails = newInfFileDetails; + strcpyW(SelectedDriver->Details.InfFileName, NewFileName); + } /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 @@ -8105,7 +8126,7 @@ TRACE("DriverDate : '%u-%u-%u'\n", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); TRACE("DriverDesc : '%s'\n", debugstr_w(SelectedDriver->Info.Description)); TRACE("DriverVersion : '%u.%u.%u.%u'\n", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); - TRACE("InfPath : '%s'\n", debugstr_w(SelectedDriver->Details.InfFileName)); + TRACE("InfPath : '%s'\n", debugstr_w(SelectedDriver->InfFileDetails->FileName)); TRACE("InfSection : '%s'\n", debugstr_w(SelectedDriver->Details.SectionName)); TRACE("InfSectionExt : '%s'\n", debugstr_w(&SectionName[strlenW(SelectedDriver->Details.SectionName)])); TRACE("MatchingDeviceId: '%s'\n", debugstr_w(SelectedDriver->MatchingId)); @@ -8122,7 +8143,7 @@ rc = RegSetValueEx(hKey, REGSTR_DRIVER_VERSION, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); } if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_INFPATH, 0, REG_SZ, (const BYTE *)SelectedDriver->Details.InfFileName, (strlenW(SelectedDriver->Details.InfFileName) + 1) * sizeof(WCHAR)); + rc = RegSetValueEx(hKey, REGSTR_VAL_INFPATH, 0, REG_SZ, (const BYTE *)SelectedDriver->InfFileDetails->FileName, (strlenW(SelectedDriver->InfFileDetails->FileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, REGSTR_VAL_INFSECTION, 0, REG_SZ, (const BYTE *)SelectedDriver->Details.SectionName, (strlenW(SelectedDriver->Details.SectionName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) @@ -8156,26 +8177,6 @@ if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) RebootRequired = TRUE; - /* Copy .inf file to Inf\ directory (if needed) */ - Result = InfIsFromOEMLocation(SelectedDriver->InfFileDetails->FullInfFileName, &NeedtoCopyFile); - if (!Result) - goto cleanup; - if (NeedtoCopyFile) - { - Result = SetupCopyOEMInfW( - SelectedDriver->InfFileDetails->FullInfFileName, - NULL, - SPOST_NONE, - SP_COPY_NOOVERWRITE, - NULL, 0, - NULL, - NULL); - if (!Result) - goto cleanup; - /* FIXME: create a new struct InfFileDetails, and set it to SelectedDriver->InfFileDetails, - * to release use of current InfFile */ - } - /* Open device registry key */ hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/install.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Mon May 29 17:32:51 2006 @@ -22,6 +22,10 @@ #include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + +/* Unicode constants */ +static const WCHAR BackSlash[] = {'\\',0}; +static const WCHAR InfDirectory[] = {'i','n','f','\\',0}; /* info passed to callback functions dealing with files */ struct files_callback_info @@ -1661,3 +1665,157 @@ TRACE("Returning %d\n", ret); return ret; } + +/*********************************************************************** + * SetupCopyOEMInfW (SETUPAPI.@) + */ +BOOL WINAPI SetupCopyOEMInfW( + IN PCWSTR SourceInfFileName, + IN PCWSTR OEMSourceMediaLocation, + IN DWORD OEMSourceMediaType, + IN DWORD CopyStyle, + OUT PWSTR DestinationInfFileName OPTIONAL, + IN DWORD DestinationInfFileNameSize, + OUT PDWORD RequiredSize OPTIONAL, + OUT PWSTR* DestinationInfFileNameComponent OPTIONAL) +{ + BOOL ret = FALSE; + + TRACE("%s %s 0x%lx 0x%lx %p 0%lu %p %p\n", + debugstr_w(SourceInfFileName), debugstr_w(OEMSourceMediaLocation), OEMSourceMediaType, + CopyStyle, DestinationInfFileName, DestinationInfFileNameSize, + RequiredSize, DestinationInfFileNameComponent); + + if (!SourceInfFileName) + SetLastError(ERROR_INVALID_PARAMETER); + else if (OEMSourceMediaType != SPOST_NONE && OEMSourceMediaType != SPOST_PATH && OEMSourceMediaType != SPOST_URL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY)) + { + TRACE("Unknown flags: 0x%08lx\n", CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY)); + SetLastError(ERROR_INVALID_FLAGS); + } + else if (!DestinationInfFileName && DestinationInfFileNameSize > 0) + SetLastError(ERROR_INVALID_PARAMETER); + else if (CopyStyle & SP_COPY_OEMINF_CATALOG_ONLY) + { + FIXME("CopyStyle 0x%lx not supported\n", SP_COPY_OEMINF_CATALOG_ONLY); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + else + { + HANDLE hSearch = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW FindFileData; + BOOL AlreadyExists; + DWORD NextFreeNumber = 0; + SIZE_T len; + LPWSTR pFullFileName = NULL; + LPWSTR pFileName; /* Pointer into pFullFileName buffer */ + + if (OEMSourceMediaType == SPOST_PATH || OEMSourceMediaType == SPOST_URL) + FIXME("OEMSourceMediaType 0x%lx ignored\n", OEMSourceMediaType); + + /* Search if the specified .inf file already exists in %WINDIR%\Inf */ + AlreadyExists = FALSE; /* FIXME */ + + if (!AlreadyExists && CopyStyle & SP_COPY_REPLACEONLY) + { + /* FIXME: set DestinationInfFileName, RequiredSize, DestinationInfFileNameComponent */ + SetLastError(ERROR_FILE_NOT_FOUND); + goto cleanup; + } + else if (AlreadyExists && (CopyStyle & SP_COPY_NOOVERWRITE)) + { + //SetLastError(ERROR_FILE_EXISTS); + /* FIXME: set return fields */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("File already exists. Need to return its name!\n"); + goto cleanup; + } + + /* Search the number to give to OEM??.INF */ + len = MAX_PATH + 1 + strlenW(InfDirectory) + 13; + pFullFileName = MyMalloc(len * sizeof(WCHAR)); + if (!pFullFileName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + len = GetSystemWindowsDirectoryW(pFullFileName, MAX_PATH); + if (len == 0 || len > MAX_PATH) + goto cleanup; + if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') + strcatW(pFullFileName, BackSlash); + strcatW(pFullFileName, InfDirectory); + pFileName = &pFullFileName[strlenW(pFullFileName)]; + sprintfW(pFileName, L"oem*.inf", NextFreeNumber); + hSearch = FindFirstFileW(pFullFileName, &FindFileData); + if (hSearch == INVALID_HANDLE_VALUE) + { + if (GetLastError() != ERROR_FILE_NOT_FOUND) + goto cleanup; + } + else + { + do + { + DWORD CurrentNumber; + if (swscanf(FindFileData.cFileName, L"oem%lu.inf", &CurrentNumber) == 1 + && CurrentNumber <= 99999) + { + NextFreeNumber = CurrentNumber + 1; + } + } while (FindNextFile(hSearch, &FindFileData)); + } + + if (NextFreeNumber > 99999) + { + ERR("Too much custom .inf files\n"); + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Create the full path: %WINDIR%\Inf\OEM{XXXXX}.inf */ + sprintfW(pFileName, L"oem%lu.inf", NextFreeNumber); + TRACE("Next available file is %s\n", debugstr_w(pFileName)); + + if (RequiredSize) + *RequiredSize = len; + if (DestinationInfFileName) + { + if (DestinationInfFileNameSize < len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto cleanup; + } + strcpyW(DestinationInfFileName, pFullFileName); + if (DestinationInfFileNameComponent) + *DestinationInfFileNameComponent = &DestinationInfFileName[pFileName - pFullFileName]; + } + + if (!CopyFileW(SourceInfFileName, pFullFileName, TRUE)) + { + TRACE("CopyFileW() failed with error 0x%lx\n", GetLastError()); + goto cleanup; + } + + if (CopyStyle & SP_COPY_DELETESOURCE) + { + if (!DeleteFileW(SourceInfFileName)) + { + TRACE("DeleteFileW() failed with error 0x%lx\n", GetLastError()); + goto cleanup; + } + } + + ret = TRUE; + +cleanup: + if (hSearch != INVALID_HANDLE_VALUE) + FindClose(hSearch); + MyFree(pFullFileName); + } + + TRACE("Returning %d\n", ret); + return ret; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Mon May 29 17:32:51 2006 @@ -78,10 +78,9 @@ * be NULL if the file is already in %SYSTEMROOT%\Inf. * Points into szData at then end of the structure */ PCWSTR DirectoryName; - /* Contains the full file name of the .inf file. However, the directory - * part may be missing if the file is already in %SYSTEMROOT%\Inf. + /* Contains the .inf file name (without directory name). * Points into szData at then end of the structure */ - PCWSTR FullInfFileName; + PCWSTR FileName; WCHAR szData[ANYSIZE_ARRAY]; }; Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c Mon May 29 17:32:51 2006 @@ -48,21 +48,6 @@ { FIXME("\n"); return FALSE; -} - -/*********************************************************************** - * SetupCopyOEMInfW (SETUPAPI.@) - */ -BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR sourcemedialoc, - DWORD mediatype, DWORD copystyle, PWSTR destinfname, - DWORD destnamesize, PDWORD required, - PWSTR *destinfnamecomponent) -{ - FIXME("%s %s 0x%lx 0x%lx\n", debugstr_w(sourceinffile), debugstr_w(sourcemedialoc), mediatype, copystyle); - FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile), - debugstr_w(sourcemedialoc)); - //return FALSE; - return TRUE; } /***********************************************************************

18 years, 3 months

[hpoussin] 22108: Fix typo ("SetupDiGetDeviceRegistryProperty" -> "SetupDiInstallDevice" in debug message)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 29 17:30:50 2006 New Revision: 22108 URL: http://svn.reactos.ru/svn/reactos?rev=22108&view=rev Log: Fix typo ("SetupDiGetDeviceRegistryProperty" -> "SetupDiInstallDevice" in debug message) Modified: trunk/reactos/dll/cpl/desk/classinst.c Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c (original) +++ trunk/reactos/dll/cpl/desk/classinst.c Mon May 29 17:30:50 2006 @@ -61,7 +61,7 @@ if (!result) { rc = GetLastError(); - DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", rc); + DPRINT("SetupDiInstallDevice() failed with error 0x%lx\n", rc); goto cleanup; }

18 years, 3 months

[frik85] 22107: RSDB update: * improved interfaces * fixed glitches * add features

by frik85＠svn.reactos.org

Author: frik85 Date: Mon May 29 17:23:25 2006 New Revision: 22107 URL: http://svn.reactos.ru/svn/reactos?rev=22107&view=rev Log: RSDB update: * improved interfaces * fixed glitches * add features Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_group.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_group_maintainer.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_home.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_details.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_forum.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.p… trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshots.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_submit.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests_submit.php trunk/web/reactos.org/htdocs/support/inc/comp/comp_itemver_submit.php trunk/web/reactos.org/htdocs/support/inc/comp/data/group_list.php trunk/web/reactos.org/htdocs/support/inc/header.php trunk/web/reactos.org/htdocs/support/inc/lang.php trunk/web/reactos.org/htdocs/support/inc/tools/please_register.php trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat.php trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.p… trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_id_maintainer.php Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_group.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_group.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_group.php Mon May 29 17:23:25 2006 @@ -254,7 +254,8 @@ $query_entry_vendor = mysql_query("SELECT * FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $result_page['grpentr_vendor'] ." ;") ; + WHERE `vendor_id` = " . $result_page['grpentr_vendor'] ." + AND `vendor_visible` = '1' ;") ; $result_entry_vendor = mysql_fetch_array($query_entry_vendor); @@ -262,6 +263,7 @@ $query_item_entry_records=mysql_query("SELECT COUNT('comp_id') FROM `rsdb_item_comp` WHERE `comp_groupid` = '" . mysql_real_escape_string($RSDB_SET_group) . "' + AND `comp_visible` = '1' AND `comp_visible` = '1' ;"); $result_item_entry_records = mysql_fetch_array($query_item_entry_records); @@ -269,7 +271,8 @@ $query_vend = mysql_query("SELECT * FROM `rsdb_item_vendor` - WHERE `vendor_id` = " . $result_page['grpentr_vendor'] ." ;") ; + WHERE `vendor_id` = " . $result_page['grpentr_vendor'] ." + AND `vendor_visible` = '1' ;") ; $result_vend = mysql_fetch_array($query_vend); ?> <p> </p> @@ -326,6 +329,7 @@ $RSDB_TEMP_version_newest = "SELECT * FROM `rsdb_item_comp` WHERE `comp_groupid` = '" . mysql_real_escape_string($RSDB_SET_group) . "' + AND `comp_visible` = '1' ORDER BY `comp_award` DESC, `comp_appversion` DESC, `comp_osversion` DESC LIMIT 1;"; } @@ -333,6 +337,7 @@ $RSDB_TEMP_version_newest = "SELECT * FROM `rsdb_item_comp` WHERE `comp_groupid` = '" . mysql_real_escape_string($RSDB_SET_group) . "' + AND `comp_visible` = '1' AND `comp_appversion` = '" . mysql_real_escape_string($RSDB_SET_group2) . "' ORDER BY `comp_award` DESC, `comp_appversion` DESC, `comp_osversion` DESC LIMIT 1;"; Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_group_maintainer.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_group_maintainer.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_group_maintainer.php Mon May 29 17:23:25 2006 @@ -181,10 +181,10 @@ </select> <font size="1"> [<?php echo $result_maintainer_group_vendor['vendor_name']; ?>]</font> <input name="pmod" type="hidden" id="pmod" value="ok"> - <br> - <br> - <br> - <input type="submit" name="Submit" value="Save"> + </font> + <p><font size="2"><em>All fields are requiered!</em></font></p> + <font size="2"> + <input type="submit" name="Submit" value="Save"> </font> </form> </div> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_home.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_home.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_home.php Mon May 29 17:23:25 2006 @@ -209,7 +209,13 @@ ?> </table> </div> -<p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> +<?php + if ($RSDB_intern_user_id <= 0) { +?> + <p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> +<?php + } +?> <script language="JavaScript" type="text/JavaScript"> <!-- document.getElementById('StartList').style.display = "block"; Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_details.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_details.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_details.php Mon May 29 17:23:25 2006 @@ -43,7 +43,7 @@ $result_page = mysql_fetch_array($query_page); if ($result_page['comp_id']) { - echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; + echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; include('inc/tree/tree_item_menubar.php'); Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_forum.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_forum.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_forum.php Mon May 29 17:23:25 2006 @@ -42,6 +42,7 @@ $result_page = mysql_fetch_array($query_page); + if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; @@ -67,4 +68,5 @@ include("inc/tools/forum_submit.php"); break; } +} ?> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.p… URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.p… (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.p… Mon May 29 17:23:25 2006 @@ -42,6 +42,7 @@ $result_page = mysql_fetch_array($query_page); +if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [ReactOS ". @show_osversion($result_page['comp_osversion']) ."]</h2>"; @@ -144,4 +145,5 @@ } } +} ?> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshots.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshots.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshots.php Mon May 29 17:23:25 2006 @@ -42,8 +42,8 @@ $result_page = mysql_fetch_array($query_page); - - echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; +if ($result_page['comp_id']) { + echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; include('inc/tree/tree_item_menubar.php'); @@ -136,5 +136,5 @@ echo '<p><b>EXIF-Data:</b><br />'.nl2br($result_screenshots["media_exif"]).'</p>'; echo '<p align="center"><b><a href="'.$RSDB_intern_link_item_item2.'screens">Show all screenshots</a></b></p>'; } - +} ?> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_submit.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_submit.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_submit.php Mon May 29 17:23:25 2006 @@ -34,13 +34,13 @@ } ?> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>home"><?php echo $RSDB_intern_code_view_name; ?></a> > Submit Appilication/Driver +<a href="<?php echo $RSDB_intern_link_db_sec; ?>home"><?php echo $RSDB_intern_code_view_name; ?></a> > Submit Application/Driver <a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> </h1> <p>ReactOS Software and Hardware Compatibility Database.</p> -<h1>Submit Appilication/Driver</h1> -<h2>Submit Appilication/Driver</h2> +<h1>Submit Application/Driver</h1> +<h2>Submit Application/Driver</h2> <?php if ($RSDB_intern_user_id <= 0) { @@ -168,13 +168,17 @@ <p> </p> <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <label for="searchinput"><strong>Application name:</strong></label>   - <input name="searchinput" type="text" id="searchinput" tabindex="0" onblur="loadItemList(this.value,'submit','comp','ajaxload','submitresult')" onkeyup="loadItemList(this.value,'submit','comp','ajaxload','submitresult')" size="30" maxlength="100"/> <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> + <input name="searchinput" type="text" id="searchinput" tabindex="0" onblur="loadItemList(this.value,'submit','comp','ajaxload','submitresult')" onkeyup="loadItemList(this.value,'submit','comp','ajaxload','submitresult')" size="30" maxlength="100"/> + <font size="1"><em>(no vendor name, no versions number)</em></font> <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> </font></p> <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <div id="submitresult" style="display: none"></div> </font></p> <p> </p> - <p><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><em>Note: "application" does mean in this context "application or driver"</em></font></p> + <p><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><em><strong>Note:</strong> <br> + "application" means in this context "application or driver". + <br> + You cannot submit data for unstable ReactOS releases (SVN builds), please <a href="http://www.reactos.org/wiki/index.php/File_Bugs" target="_blank">submit</a> bugs/regressions to <a href="http://www.reactos.org/bugzilla/" target="_blank">bugzilla</a> instead. </em></font></p> <hr size="1" noshade color="#CCCCCC" id="sdsd"> <table width="100%" border="0"> <tr> <td width="50%" align="left"><button name="helpwizp" type="button" value="Help" onClick="WizHelp()"> Help </button></td> @@ -201,7 +205,7 @@ <tr> <td height="21" colspan="2" align="left" valign="top"> - <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><strong>Application name:</strong> <font size="1"><em>(e.g. "Firefox", "OpenOffice.org", etc; no version number/data)</em></font><br> + <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><strong>Application name:</strong> <font size="1"><em>(e.g. "Firefox", "OpenOffice.org", etc; no vendor name and no version number/data)</em></font><br> <strong> <input name="txtname" type="text" id="txtname" onkeyup="checkFields()" value="<?php echo htmlentities($RSDB_TEMP_txtname); ?>" size="50" maxlength="100" /> </strong></font></p> @@ -225,7 +229,7 @@ <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <label for="searchvendor"><strong>Vendor name:</strong></label> </font><font face="Verdana, Arial, Helvetica, sans-serif"><font size="1"><i>(Vendor, Company, Team or Project)</i></font></font><font size="2" face="Verdana, Arial, Helvetica, sans-serif"></font><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><br /> - <input name="searchvendor" type="text" id="searchvendor" tabindex="0" onkeyup="loadItemList(this.value,'submit_vendor','vendor','ajaxvendload','vendorresult')" size="30" maxlength="100"/> <img id="ajaxvendload" src="images/ajax_loading.gif" style="display: none" /> + <input name="searchvendor" type="text" id="searchvendor" tabindex="0" onBlur="loadItemList(this.value,'submit_vendor','vendor','ajaxvendload','vendorresult')" onkeyup="loadItemList(this.value,'submit_vendor','vendor','ajaxvendload','vendorresult')" size="30" maxlength="100"/> <img id="ajaxvendload" src="images/ajax_loading.gif" style="display: none" /> </font></p> <p><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <div id="vendorresult" style="display: none"></div> @@ -307,6 +311,9 @@ else { document.getElementById('pag2').style.display = 'table'; } + if (document.getElementById('txtname').value == "") { + document.getElementById('txtname').value = document.getElementById('searchinput').value; + } } function WizHelp() { Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests.php Mon May 29 17:23:25 2006 @@ -42,8 +42,9 @@ $result_page = mysql_fetch_array($query_page); - - echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; +if ($result_page['comp_id']) { + + echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; include('inc/tree/tree_item_menubar.php'); @@ -202,4 +203,5 @@ echo "<p><i>This test report is beneath your threshold!</i></p>"; } } +} ?> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests_submit.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests_submit.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_tests_submit.php Mon May 29 17:23:25 2006 @@ -42,8 +42,10 @@ $result_page = mysql_fetch_array($query_page); - - echo "<h2>".htmlentities($result_page['comp_name']) ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; +if ($result_page['comp_id']) { + + echo "<h2>".htmlentities($result_page['comp_name']) ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; + if ($RSDB_intern_user_id <= 0) { @@ -132,7 +134,10 @@ <form name="RSDB_comp_testreport" method="post" action="<?php echo $RSDB_intern_link_submit_comp_test; ?>submit"> -<p><font size="2">Please write full sentenses and avoid abbreviations!</font></p> +<p><font size="2">Please report compatibility with ReactOS release versions only, write full sentenses and avoid abbreviations!</font></p> +<p> </p> +<p><font size="3"><?php echo "<b>".htmlentities($result_page['comp_name']) ."</b>"; ?></font> and <font size="3"><?php echo "<b>". "ReactOS ".show_osversion($result_page['comp_osversion']) ."</b>"; ?></font> release</p> +<p><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><em>You cannot submit compatibility test reports for unstable ReactOS revisions (SVN builds), please <a href="http://www.reactos.org/wiki/index.php/File_Bugs" target="_blank">submit</a> bugs/regressions to <a href="http://www.reactos.org/bugzilla/" target="_blank">bugzilla</a> instead. Thank you!</em></font></p> <p><font size="2"><strong>What works:</strong><br /> <textarea name="txtwhatwork" cols="70" rows="5" id="txtwhatwork"><?php echo $RSDB_TEMP_txtwhatwork; ?></textarea> </font></p> @@ -201,4 +206,5 @@ } } +} ?> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/comp_itemver_submit.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_itemver_submit.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_itemver_submit.php Mon May 29 17:23:25 2006 @@ -312,7 +312,8 @@ } ?> <p> </p> - <p><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><em>Note: You cannot submit data for unstable ReactOS releases (SVN builds). Please use <a href="http://www.reactos.org/bugzilla/" target="_blank">bugzilla</a> instead to <b>report current regressions</b>, to do so <a href="http://www.reactos.org/wiki/index.php/File_Bugs" target="_blank">please submit bugs</a>. Thank you!</em></font></p> + <p><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><em><strong>Note:</strong><br> + You cannot submit data for unstable ReactOS releases (SVN builds), please <a href="http://www.reactos.org/wiki/index.php/File_Bugs" target="_blank">submit</a> bugs/regressions to <a href="http://www.reactos.org/bugzilla/" target="_blank">bugzilla</a> instead. Thank you!</em></font></p> <hr size="1" noshade color="#CCCCCC" id="sdsd"> <table width="100%" border="0"> <tr> Modified: trunk/web/reactos.org/htdocs/support/inc/comp/data/group_list.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/data/group_list.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/data/group_list.php Mon May 29 17:23:25 2006 @@ -26,20 +26,39 @@ * 2005 - 2006 */ - // To prevent hacking activity: if ( !defined('RSDB') ) { die(" "); } + $query_count_groups=mysql_query("SELECT COUNT('grpentr_id') + FROM `rsdb_groups`, `rsdb_item_vendor` + WHERE grpentr_vendor = vendor_id + AND (`grpentr_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + OR `vendor_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%') + AND `grpentr_comp` = '1' + AND `vendor_visible` = '1' + AND `grpentr_visible` = '1' + ;"); + $result_count_groups = mysql_fetch_row($query_count_groups); - $query_count_groups=mysql_query("SELECT COUNT('grpentr_id') - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' - AND `grpentr_comp` = '1' ;"); - $result_count_groups = mysql_fetch_row($query_count_groups); + if (!$result_count_groups[0]) { + // Remove temp characters and try again + $RSDB_SET_search = str_replace("-","",$RSDB_SET_search); + $RSDB_SET_search = str_replace("_","",$RSDB_SET_search); + $RSDB_SET_search = str_replace(" ","",$RSDB_SET_search); + $query_count_groups=mysql_query("SELECT COUNT('grpentr_id') + FROM `rsdb_groups`, `rsdb_item_vendor` + WHERE grpentr_vendor = vendor_id + AND (`grpentr_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + OR `vendor_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%') + AND `grpentr_comp` = '1' + AND `vendor_visible` = '1' + AND `grpentr_visible` = '1' + ;"); + $result_count_groups = mysql_fetch_row($query_count_groups); + } header( 'Content-type: text/xml' ); echo '<?xml version="1.0" encoding="UTF-8"?> @@ -56,13 +75,17 @@ if ($RSDB_SET_search != "" || strlen($RSDB_SET_search) > 1) { $query_page = mysql_query("SELECT * - FROM `rsdb_groups` - WHERE `grpentr_visible` = '1' - AND `grpentr_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + FROM `rsdb_groups`, `rsdb_item_vendor` + WHERE grpentr_vendor = vendor_id + AND (`grpentr_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + OR `vendor_name` LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%') AND `grpentr_comp` = '1' - ORDER BY `grpentr_name` ASC ;") ; + AND `vendor_visible` = '1' + AND `grpentr_visible` = '1' + ORDER BY `grpentr_name` ASC + LIMIT 20 ;") ; // Limit to 20 entry - while($result_page = mysql_fetch_array($query_page)) { // Pages + while($result_page = mysql_fetch_array($query_page)) { ?> <dbentry> <item id="<?php echo $result_page['grpentr_id']; ?>"><?php echo $result_page['grpentr_name']; ?></item> Modified: trunk/web/reactos.org/htdocs/support/inc/header.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/header.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/header.php Mon May 29 17:23:25 2006 @@ -47,16 +47,18 @@ ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html lang="de"> +<html lang="<?php echo $RSDB_langres['lang_code']; ?>"> <head> - <title>ReactOS Homepage - <?php echo $page_title ; ?></title> + <title>ReactOS <?php echo $page_title ; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $RSDB_langres['charset']; ?>" /> - <meta http-equiv="Pragma" content="no-cache" > - <meta name="Copyright" content="ReactOS Foundation" > - <meta name="generator" content="RSDB" > - <meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>"> - <meta name="Robots" content="index,follow" > - <LINK REL="SHORTCUT ICON" HREF="../favicon.ico" > + <meta http-equiv="Pragma" content="no-cache" /> + <meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." /> + <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" /> + <meta name="Copyright" content="ReactOS Foundation" /> + <meta name="Generator" content="RSDB" /> + <meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>" /> + <meta name="Robots" content="index,follow" /> + <LINK REL="SHORTCUT ICON" HREF="../favicon.ico" /> <link href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>style.css" type="text/css" rel="stylesheet" /> <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>smoothscroll.js" language="javascript"></script> <script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>search.js" language="javascript"></script> Modified: trunk/web/reactos.org/htdocs/support/inc/lang.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/lang.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/lang.php Mon May 29 17:23:25 2006 @@ -37,20 +37,25 @@ // Language detection function check_lang($lang) { - if (preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { - $checked_lang = strtolower($matches[1]); - switch($checked_lang) { - case 'de': - case 'en': - case 'fr': - case 'ru': - break; - default: + if ($lang) { + if (@preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { + $checked_lang = @strtolower($matches[1]); + switch($checked_lang) { + case 'de': + case 'en': + case 'fr': + case 'ru': + break; + default: + $checked_lang = ''; + } + } + else if ($lang == '*') { + $checked_lang = 'en'; + } + else { $checked_lang = ''; } - } - else if ($lang == '*') { - $checked_lang = 'en'; } else { $checked_lang = ''; @@ -73,11 +78,11 @@ help us. */ $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; $best_q = 0; - while (preg_match('/^\s*([^,]+)((,(.*))|$)/', + while (@preg_match('/^\s*([^,]+)((,(.*))|$)/', $accept_language, $matches)) { $lang_range = @$matches[1]; $accept_language = @$matches[4]; - if (preg_match('/^(([a-zA-Z]+)(-[a-zA-Z]+)?)(;q=([0-1](\.[0-9]{1,3})?))?/', + if (@preg_match('/^(([a-zA-Z]+)(-[a-zA-Z]+)?)(;q=([0-1](\.[0-9]{1,3})?))?/', $lang_range, $matches)) { $lang = check_lang($matches[1]); if ($lang != '') { @@ -114,7 +119,7 @@ '/', cookie_domain()); } -/* This HACK is only to for the first few weeks; when more language files are available, simply delete the following file */ +/* This HACK is only to for the first few weeks; when more language files are available, simply delete the following line */ $rpm_lang="en"; Modified: trunk/web/reactos.org/htdocs/support/inc/tools/please_register.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tools/please_register.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/tools/please_register.php Mon May 29 17:23:25 2006 @@ -39,7 +39,7 @@ global $RSDB_intern_path_server; global $RSDB_intern_loginsystem_path; - msg_bar("<b>Login required!</b><br /><br />Please use the <a href=\"".$RSDB_intern_path_server.$RSDB_intern_loginsystem_path."?page=login\">login function</a> to get access or + msg_bar("<b>Login required!</b><br /><br />Please use the <a href=\"".$RSDB_intern_path_server.$RSDB_intern_loginsystem_path."?page=login&target=%2Fsupport%2F\">login function</a> to get access or <a href=\"".$RSDB_intern_path_server.$RSDB_intern_loginsystem_path."?page=register\">register an account</a> for free!"); } Modified: trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat.php Mon May 29 17:23:25 2006 @@ -41,7 +41,8 @@ $query_count_cat=mysql_query("SELECT COUNT('cat_id') FROM `rsdb_item_vendor` - WHERE `vendor_name` LIKE '" . $RSDB_SET_letter . "%' ;"); + WHERE `vendor_name` LIKE '" . $RSDB_SET_letter . "%' + AND `vendor_visible` = '1' ;"); $result_count_cat = mysql_fetch_row($query_count_cat); if ($result_count_cat[0]) { @@ -73,6 +74,7 @@ $query_page = mysql_query("SELECT * FROM `rsdb_item_vendor` WHERE `vendor_name` LIKE '" . mysql_real_escape_string($RSDB_SET_letter) . "%' + AND `vendor_visible` = '1' ORDER BY `vendor_name` ASC LIMIT " . mysql_real_escape_string($RSDB_SET_curpos) . " , " . mysql_real_escape_string($RSDB_intern_items_per_page) . " ;") ; Modified: trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.p… URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.p… (original) +++ trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.p… Mon May 29 17:23:25 2006 @@ -72,7 +72,7 @@ if (array_key_exists("txtinfo", $_POST)) $RSDB_TEMP_txtinfo=htmlspecialchars($_POST["txtinfo"]); // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_sec == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_fullname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_sec == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { // Submit vendor entry: $update_group_entry = "INSERT INTO `rsdb_item_vendor` ( `vendor_id` , `vendor_name` , `vendor_visible` , `vendor_fullname` , `vendor_url` , `vendor_email` , `vendor_infotext` , `vendor_usrid` , `vendor_usrip` , `vendor_date` , `vendor_checked` ) @@ -102,7 +102,7 @@ <a href="javascript:Show_vendentry()">Submit new vendor</a> | <a href="javascript:Show_requests()">Special requests</a></p> <div id="vendentry" style="display: block"> <fieldset> - <legend>Edit vendor data</legend> + <legend>Submit new vendor</legend> <div align="left"> <form name="form1" method="post" action="<?php echo $RSDB_intern_link_db_sec.$RSDB_SET_sec."#maintainerbar"; ?>"> <p><font size="2">Vendor </font><font size="2">name: @@ -111,7 +111,7 @@ <br> Vendor fullname: <input name="fullname" type="text" id="fullname" size="70" maxlength="255"> - (max. 255 chars) <br> + (max. 255 chars, optional) <br> <br> URL: <input name="txturl" type="text" id="txturl" size="70" maxlength="255"> @@ -119,7 +119,7 @@ <br> E-Mail: <input name="txtemail" type="text" id="txtemail" size="70" maxlength="100"> - (max. 100 chars) </font></p> + (max. 100 chars, optional) </font></p> <p><font size="2">Information:<br> <textarea name="txtinfo" cols="70" rows="5" id="txtinfo"></textarea> <input name="pmod" type="hidden" id="pmod" value="ok"> @@ -128,7 +128,7 @@ <br> <input type="submit" name="Submit" value="Save"> </font> - </p> + </p> </form> </div> </fieldset> Modified: trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_id_maintainer.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_id_maintainer.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_id_maintainer.php Mon May 29 17:23:25 2006 @@ -73,7 +73,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_vendor != "" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_fullname != "" && $RSDB_TEMP_txturl != "" && $RSDB_TEMP_txtemail != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_vendor != "" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { // Update group entry: $update_group_entry = "UPDATE `rsdb_item_vendor` SET `vendor_name` = '". mysql_real_escape_string($RSDB_TEMP_vendname) ."', `vendor_fullname` = '". mysql_real_escape_string($RSDB_TEMP_fullname) ."', @@ -136,7 +136,7 @@ <br> Vendor fullname: <input name="fullname" type="text" id="fullname" value="<?php echo $result_maintainer_vendor['vendor_fullname']; ?>" size="70" maxlength="255"> - (max. 255 chars) <br> + (max. 255 chars, optional) <br> <br> URL: <input name="txturl" type="text" id="txturl" value="<?php echo $result_maintainer_vendor['vendor_url']; ?>" size="70" maxlength="255"> @@ -144,7 +144,7 @@ <br> E-Mail: <input name="txtemail" type="text" id="txtemail" value="<?php echo $result_maintainer_vendor['vendor_email']; ?>" size="70" maxlength="100"> - (max. 100 chars) </font></p> + (max. 100 chars, optional) </font></p> <p><font size="2">Information:<br> <textarea name="txtinfo" cols="70" rows="5" id="txtinfo"><?php echo $result_maintainer_vendor['vendor_infotext']; ?></textarea> <input name="pmod" type="hidden" id="pmod" value="ok">

18 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006