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.php 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.php 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/c... ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/comp/comp_item_screenshot_submit.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>";
@@ -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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/c... ============================================================================== --- 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/h... ============================================================================== --- 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/l... ============================================================================== --- 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/t... ============================================================================== --- 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/t... ============================================================================== --- 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.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inc/t... ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.php (original) +++ trunk/web/reactos.org/htdocs/support/inc/tree/tree_vendor_flat_maintainer.php 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/t... ============================================================================== --- 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">
-
frik85＠svn.reactos.org