claunia/appdb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/Wine/QEMU/, s/AppDB/OS DB/, s/Application/OS/ in text

Browse Source 
svn path=/; revision=17
This commit is contained in:
sbrady
2009-10-10 22:51:46 +00:00
parent 9a9379e1ff
commit f066ebee27
25 changed files with 176 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
account.php
View File

@@ -122,7 +122,7 @@ function cmd_do_new()
retry("new", "Failed to create account"); retry("new", "Failed to create account");
} else } else
{ {
addmsg("Unknown failure while creating new user. Please report this problem to appdb admins.", "red"); addmsg("Unknown failure while creating new user. Please report this problem to OS DB admins.", "red");
retry("new", "Failed to create account"); retry("new", "Failed to create account");
} }
} }
@@ -144,8 +144,11 @@ function cmd_send_passwd()
util_redirect_and_exit(apidb_fullurl("account.php?sCmd=login")); util_redirect_and_exit(apidb_fullurl("account.php?sCmd=login"));
} }
$shNote = '(<b>Note</b>: accounts for <b>appdb</b>.winehq.org and <b>bugs</b>.winehq.org ' /*
.'are separated, so You might need to <b>create second</b> account for appdb.)'; $shNote = '(<b>Note</b>: accounts for the OS DB and <b>bugs</b>.claunia.com '
.'are separated, so You might need to <b>create second</b> account for OS DB.)';
*/
$shNote = '';
$iUserId = User::exists($aClean['sUserEmail']); $iUserId = User::exists($aClean['sUserEmail']);
$sPasswd = User::generate_passwd(); $sPasswd = User::generate_passwd();
@@ -154,7 +157,7 @@ function cmd_send_passwd()
{ {
if ($oUser->update_password($sPasswd)) if ($oUser->update_password($sPasswd))
{ {
$sSubject = "Application DB Lost Password"; $sSubject = "OS DB Lost Password";
$sMsg = "We have received a request that you lost your password.\r\n"; $sMsg = "We have received a request that you lost your password.\r\n";
$sMsg .= "We will create a new password for you. You can then change\r\n"; $sMsg .= "We will create a new password for you. You can then change\r\n";
$sMsg .= "your password at the Preferences screen.\r\n"; $sMsg .= "your password at the Preferences screen.\r\n";

6
appdbStats.php
View File

@@ -7,7 +7,7 @@ require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require_once(BASE."include/user.php"); require_once(BASE."include/user.php");
apidb_header("Appdb Statistics"); apidb_header("OS DB Statistics");
echo "<div class='default_container'>\n"; echo "<div class='default_container'>\n";
@@ -59,7 +59,7 @@ echo "</tr>\n\n";
/* Display the number of application familes */ /* Display the number of application familes */
echo "<tr class=color4>\n"; echo "<tr class=color4>\n";
echo " <td>Application families:</td>\n"; echo " <td>OS families:</td>\n";
echo " <td>".application::objectGetEntriesCount('accepted')."</td>\n"; echo " <td>".application::objectGetEntriesCount('accepted')."</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";
@@ -71,7 +71,7 @@ echo "</tr>\n\n";
/* Display the number of application maintainers */ /* Display the number of application maintainers */
echo "<tr class=color4>\n"; echo "<tr class=color4>\n";
echo " <td>Application maintainers:</td>\n"; echo " <td>OS maintainers:</td>\n";
echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";

4
contact.php
View File

@@ -139,13 +139,13 @@ if(!$aClean['sSubmit'])
$sSubjectRe = urlencode($sSubjectRe); $sSubjectRe = urlencode($sSubjectRe);
$sMsg = "The following message was sent to you from $oUser->sRealname "; $sMsg = "The following message was sent to you from $oUser->sRealname ";
$sMsg .= "through the Wine AppDB contact form.\nTo Reply, visit "; $sMsg .= "through the QEMU OS DB contact form.\nTo Reply, visit ";
$sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId&amp;sSubject="; $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId&amp;sSubject=";
$sMsg .= $sSubjectRe."\n\n"; $sMsg .= $sSubjectRe."\n\n";
$sMsg .= $aClean['sMessage']; $sMsg .= $aClean['sMessage'];
} else } else
{ {
$sMsg = "The following message was sent to you by the AppDB admins:\n\n"; $sMsg = "The following message was sent to you by the OS DB admins:\n\n";
$sMsg .= $aClean['sMessage']; $sMsg .= $aClean['sMessage'];
} }

104
include/application.php
View File

@@ -160,7 +160,7 @@ class Application {
$oMaintainer = new Maintainer(); $oMaintainer = new Maintainer();
$oMaintainer->iAppId = $this->iAppId; $oMaintainer->iAppId = $this->iAppId;
$oMaintainer->iUserId = $_SESSION['current']->iUserId; $oMaintainer->iUserId = $_SESSION['current']->iUserId;
$oMaintainer->sMaintainReason = "This user submitted the application; auto-queued."; $oMaintainer->sMaintainReason = "This user submitted the OS; auto-queued.";
$oMaintainer->bSuperMaintainer = 1; $oMaintainer->bSuperMaintainer = 1;
$oMaintainer->create(); $oMaintainer->create();
} }
@@ -168,7 +168,7 @@ class Application {
return true; return true;
} else } else
{ {
addmsg("Error while creating a new application.", "red"); addmsg("Error while creating a new OS.", "red");
return false; return false;
} }
} }
@@ -349,7 +349,7 @@ class Application {
$this->SendNotificationMail("reject"); $this->SendNotificationMail("reject");
// the application has been rejected // the application has been rejected
addmsg("The application has been rejected.", "green"); addmsg("The OS has been rejected.", "green");
} }
} }
@@ -373,7 +373,7 @@ class Application {
$this->SendNotificationMail(); $this->SendNotificationMail();
// the application has been re-queued // the application has been re-queued
addmsg("The application has been re-queued.", "green"); addmsg("The OS has been re-queued.", "green");
} }
} }
@@ -394,8 +394,8 @@ class Application {
switch($sAction) switch($sAction)
{ {
case "delete": case "delete":
$sSubject = "Submitted application deleted"; $sSubject = "Submitted OS deleted";
$sMsg = "The application you submitted (".$this->sName. $sMsg = "The OS you submitted (".$this->sName.
") has been deleted."; ") has been deleted.";
break; break;
} }
@@ -406,7 +406,7 @@ class Application {
{ {
case "delete": case "delete":
$sSubject = $this->sName." deleted"; $sSubject = $this->sName." deleted";
$sMsg = "The application '".$this->sName."' has been deleted."; $sMsg = "The OS '".$this->sName."' has been deleted.";
break; break;
} }
$aMailTo = User::get_notify_email_address_list($this->iAppId); $aMailTo = User::get_notify_email_address_list($this->iAppId);
@@ -426,24 +426,24 @@ class Application {
switch($sAction) switch($sAction)
{ {
case "add": case "add":
$sSubject = "Submitted application accepted"; $sSubject = "Submitted OS accepted";
$sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname.".\n"; $sMsg = "The OS you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname.".\n";
$sMsg .= "Administrator's Response:\n"; $sMsg .= "Administrator's Response:\n";
break; break;
case "reject": case "reject":
$sSubject = "Submitted application rejected"; $sSubject = "Submitted OS rejected";
$sMsg = "The application you submitted (".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg = "The OS you submitted (".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname.".";
$sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the OS. ";
$sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= "A link to your queue of OSes and versions will also show up on the left hand side of the OS DB site once you have logged in. ";
$sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue". $sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue".
"&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=". "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=".
"Edit+Application\n"; "Edit+OS\n";
$sMsg .= "Reason given:\n"; $sMsg .= "Reason given:\n";
break; break;
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Application Database better for all users."; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }
@@ -502,34 +502,34 @@ class Application {
if($this->iSubmitterId) if($this->iSubmitterId)
{ {
$oSubmitter = new User($this->iSubmitterId); $oSubmitter = new User($this->iSubmitterId);
$sMsg .= "This application has been submitted by ".$oSubmitter->sRealname."."; $sMsg .= "This OS has been submitted by ".$oSubmitter->sRealname.".";
$sMsg .= "\n"; $sMsg .= "\n";
} }
if($aClean['sReplyText']) if($aClean['sReplyText'])
{ {
$sMsg .= "Appdb admin reply text:\n"; $sMsg .= "OS DB admin reply text:\n";
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
} }
addmsg("The application was successfully added into the database.", "green"); addmsg("The OS was successfully added into the database.", "green");
} else } else
{ {
$sSubject = $this->sName." has been submitted by ".$_SESSION['current']->sRealname; $sSubject = $this->sName." has been submitted by ".$_SESSION['current']->sRealname;
$sMsg .= "This application has been queued."; $sMsg .= "This OS has been queued.";
$sMsg .= "\n"; $sMsg .= "\n";
addmsg("The application you submitted will be added to the database after being reviewed.", "green"); addmsg("The OS you submitted will be added to the database after being reviewed.", "green");
} }
break; break;
case "edit": case "edit":
$sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname; $sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname;
$sMsg .= $this->objectMakeUrl()."\n"; $sMsg .= $this->objectMakeUrl()."\n";
addmsg("Application modified.", "green"); addmsg("OS modified.", "green");
break; break;
case "reject": case "reject":
$sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname; $sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname;
$sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue". $sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue".
"&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=". "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=".
"Edit+Application\n"; "Edit+OS\n";
// if sReplyText is set we should report the reason the application was rejected // if sReplyText is set we should report the reason the application was rejected
if($aClean['sReplyText']) if($aClean['sReplyText'])
@@ -538,7 +538,7 @@ class Application {
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
} }
addmsg("Application rejected.", "green"); addmsg("OS rejected.", "green");
break; break;
} }
$sEmail = User::get_notify_email_address_list($this->iAppId); $sEmail = User::get_notify_email_address_list($this->iAppId);
@@ -562,9 +562,9 @@ class Application {
name and the full editor displayed here */ name and the full editor displayed here */
echo '<input type="hidden" name="bMainAppForm" value="true">'."\n"; echo '<input type="hidden" name="bMainAppForm" value="true">'."\n";
echo html_frame_start("Application Form", "90%", "", 0); echo html_frame_start("OS Form", "90%", "", 0);
echo "<table class='color0' width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo "<table class='color0' width='100%' border=0 cellpadding=2 cellspacing=0>\n";
echo '<tr valign=top><td class="color0"><b>Application name</b></td>',"\n"; echo '<tr valign=top><td class="color0"><b>OS name</b></td>',"\n";
echo '<td><input size="20" type="text" name="sAppName" value="'.$this->sName.'"></td></tr>',"\n"; echo '<td><input size="20" type="text" name="sAppName" value="'.$this->sName.'"></td></tr>',"\n";
// app Category // app Category
@@ -585,7 +585,7 @@ class Application {
echo '</td></tr>',"\n"; echo '</td></tr>',"\n";
$oVendor = new vendor($this->iVendorId); $oVendor = new vendor($this->iVendorId);
$sVendorHelp = "The developer of the application. "; $sVendorHelp = "The developer of the OS. ";
if(!$this->iAppId || $oVendor->objectGetState() != 'accepted') if(!$this->iAppId || $oVendor->objectGetState() != 'accepted')
{ {
if(!$this->iAppId) if(!$this->iAppId)
@@ -626,7 +626,7 @@ class Application {
echo '<tr valign=top><td class="color0"><b>Keywords</b></td>',"\n"; echo '<tr valign=top><td class="color0"><b>Keywords</b></td>',"\n";
echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n"; echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n";
echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n"; echo '<tr valign=top><td class="color0"><b>OS description (In your own words)</b></td>',"\n";
echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">'; echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">';
echo $this->sDescription.'</textarea></p></td></tr>',"\n"; echo $this->sDescription.'</textarea></p></td></tr>',"\n";
@@ -642,7 +642,7 @@ class Application {
"I would like to be a maintainer of the new version only<br>\n". "I would like to be a maintainer of the new version only<br>\n".
"<input type=\"radio\" name=\"iMaintainerRequest\" ". "<input type=\"radio\" name=\"iMaintainerRequest\" ".
"value=\"".SUPERMAINTAINER_REQUEST."\">". "value=\"".SUPERMAINTAINER_REQUEST."\">".
"I would like to be a maintainer of the entire application<br>\n"; "I would like to be a maintainer of the entire OS<br>\n";
$sMaintainerOptionsSelected = str_replace( $sMaintainerOptionsSelected = str_replace(
"value=\"$this->iMaintainerRequest\"", "value=\"$this->iMaintainerRequest\"",
@@ -665,20 +665,20 @@ class Application {
$errors = ""; $errors = "";
if (empty($aValues['iAppCatId'])) if (empty($aValues['iAppCatId']))
$errors .= "<li>Please enter a category for your application.</li>\n"; $errors .= "<li>Please enter a category for your OS.</li>\n";
if (strlen($aValues['sAppName']) > 200 ) if (strlen($aValues['sAppName']) > 200 )
$errors .= "<li>Your application name is too long.</li>\n"; $errors .= "<li>Your OS name is too long.</li>\n";
if (empty($aValues['sAppName'])) if (empty($aValues['sAppName']))
$errors .= "<li>Please enter an application name.</li>\n"; $errors .= "<li>Please enter an OS name.</li>\n";
// No vendor entered, and nothing in the list is selected // No vendor entered, and nothing in the list is selected
if (empty($aValues['sVendorName']) && !$aValues['iAppVendorId']) if (empty($aValues['sVendorName']) && !$aValues['iAppVendorId'])
$errors .= "<li>Please enter a developer.</li>\n"; $errors .= "<li>Please enter a developer.</li>\n";
if (empty($aValues['shAppDescription'])) if (empty($aValues['shAppDescription']))
$errors .= "<li>Please enter a description of your application.</li>\n"; $errors .= "<li>Please enter a description of your OS.</li>\n";
return $errors; return $errors;
} }
@@ -716,7 +716,7 @@ class Application {
echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n";
echo "<tr class=\"color4\">\n"; echo "<tr class=\"color4\">\n";
echo " <td>Application Name</td>\n"; echo " <td>OS Name</td>\n";
echo " <td>Description</td>\n"; echo " <td>Description</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";
@@ -837,7 +837,7 @@ class Application {
if($_SESSION['current']->isSuperMaintainer($this->iAppId) || $_SESSION['current']->hasPriv("admin")) if($_SESSION['current']->isSuperMaintainer($this->iAppId) || $_SESSION['current']->hasPriv("admin"))
{ {
echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit application" class="button"></form>'; echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit OS" class="button"></form>';
echo '<form method="post" action="objectManager.php?sClass=note&sAction=add&sTitle=Add+note&iAppId='.$this->iAppId.'&sNoteTitle=HOWTO&sReturnTo='.urlencode($this->objectMakeUrl()).'">'; echo '<form method="post" action="objectManager.php?sClass=note&sAction=add&sTitle=Add+note&iAppId='.$this->iAppId.'&sNoteTitle=HOWTO&sReturnTo='.urlencode($this->objectMakeUrl()).'">';
echo '<input type="submit" value="Add note/how-to" />'; echo '<input type="submit" value="Add note/how-to" />';
echo '</form>'; echo '</form>';
@@ -876,7 +876,7 @@ class Application {
echo "\t</div>\n"; // close the 'info_contents' div echo "\t</div>\n"; // close the 'info_contents' div
echo "</div>\n"; // close the 'info_container' div echo "</div>\n"; // close the 'info_container' div
echo html_frame_end("For more details and user comments, view the versions of this application."); echo html_frame_end("For more details and user comments, view the versions of this OS.");
// display versions // display versions
Version::displayList($this->getVersions()); Version::displayList($this->getVersions());
@@ -917,7 +917,7 @@ class Application {
$oTable->SetAlign("center"); $oTable->SetAlign("center");
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("OS");
$oTableRow->AddTextCell("Description"); $oTableRow->AddTextCell("Description");
$oTableRow->AddTextCell("Developer"); $oTableRow->AddTextCell("Developer");
$oTableRow->AddTextCell("Submission Date"); $oTableRow->AddTextCell("Submission Date");
@@ -957,7 +957,7 @@ class Application {
public function objectGetClassDisplayName() public function objectGetClassDisplayName()
{ {
return 'application'; return 'OS';
} }
public function objectMakeUrl() public function objectMakeUrl()
@@ -1098,7 +1098,7 @@ class Application {
$aWineVersionIds = get_bugzilla_version_ids(); $aWineVersionIds = get_bugzilla_version_ids();
$oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage'));
$oFilter->AddFilterInfo('versions.id', 'Wine version', array(FILTER_EQUALS,FILTER_LESS_THAN,FILTER_GREATER_THAN), FILTER_VALUES_ENUM, $aWineVersionIds, $aWineVersions); $oFilter->AddFilterInfo('versions.id', 'QEMU version', array(FILTER_EQUALS,FILTER_LESS_THAN,FILTER_GREATER_THAN), FILTER_VALUES_ENUM, $aWineVersionIds, $aWineVersions);
$oFilter->AddFilterInfo('appCategory', 'Category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appCategory', 'Category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames);
$oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses);
$oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL);
@@ -1197,7 +1197,7 @@ class Application {
public function objectDisplayQueueProcessingHelp() public function objectDisplayQueueProcessingHelp()
{ {
echo "<p>This is the list of application entries waiting to be processed.</p>\n"; echo "<p>This is the list of OS entries waiting to be processed.</p>\n";
echo "<p>To view and process an entry, use the links under &#8216;Action&#8217;</p>"; echo "<p>To view and process an entry, use the links under &#8216;Action&#8217;</p>";
} }
@@ -1206,36 +1206,38 @@ class Application {
/* We don't display the full help on the page where you only input the app name */ /* We don't display the full help on the page where you only input the app name */
if(!$this->sName) if(!$this->sName)
{ {
echo "<p>First, please enter the name of the application you wish to add. "; echo "<p>First, please enter the name of the OS you wish to add. ";
echo "This will allow you to determine whether there is already "; echo "This will allow you to determine whether there is already ";
echo "an entry for it in the database.</p>\n"; echo "an entry for it in the database.</p>\n";
} else } else
{ {
echo "<p>This page is for submitting new applications to be added to the\n"; echo "<p>This page is for submitting new OSes to be added to the\n";
echo "database. The application will be reviewed by an AppDB Administrator,\n"; echo "database. The OS will be reviewed by an OS DB Administrator,\n";
echo "and you will be notified via e-mail if it is added to the database or rejected.</p>\n"; echo "and you will be notified via e-mail if it is added to the database or rejected.</p>\n";
echo "<p><h2>Before continuing, please ensure that you have</h2>\n"; echo "<p><h2>Before continuing, please ensure that you have</h2>\n";
echo "<ul>\n"; echo "<ul>\n";
echo " <li>Entered a valid version for this application. This is the application\n"; echo " <li>Entered a valid version for this OS. This is the OS\n";
echo " version, NOT the Wine version (which goes in the test results section of the template)</li>\n"; echo " version, NOT the QEMU version (which goes in the test results section of the template)</li>\n";
echo " <li>Tested this application under Wine. There are tens of thousands of applications\n"; echo " <li>Tested this OS under QEMU. As there are a large number of OSes,\n";
echo " for Windows, we do not need placeholder entries in the database. Please enter as complete \n"; echo " we do not need placeholder entries in the database. Please enter as complete \n";
echo " as possible test results in the version template provided below</li>\n"; echo " as possible test results in the version template provided below</li>\n";
echo "</ul></p>"; echo "</ul></p>";
/*
echo "<p>Having app descriptions just sponsoring the app\n"; echo "<p>Having app descriptions just sponsoring the app\n";
echo "(yes, some vendors want to use the appdb for this) or saying &#8216;I haven't tried this app with Wine&#8217; "; echo "(yes, some vendors want to use the appdb for this) or saying &#8216;I haven't tried this app with Wine&#8217; ";
echo "will not help Wine development or Wine users. Application descriptions should be exactly that and only that, \n"; echo "will not help Wine development or Wine users. OS descriptions should be exactly that and only that, \n";
echo "they should not contain any information about how well the app works, just what the app is. The same applies to the \n"; echo "they should not contain any information about how well the app works, just what the app is. The same applies to the \n";
echo "version information, it should be only information on what is unique or different about that version of the application, \n"; echo "version information, it should be only information on what is unique or different about that version of the OS, \n";
echo "not how well that version works or how great you think a new feature is.</p>\n"; echo "not how well that version works or how great you think a new feature is.</p>\n";
*/
echo "<p>When you reach the \"Test Form\" part (What works, What doesn't work, etc) please be detailed \n"; echo "<p>When you reach the \"Test Form\" part (What works, What doesn't work, etc) please be detailed \n";
echo "about how well it worked and if any workarounds were needed but do NOT paste chunks of terminal output.</p>\n"; echo "about how well it worked and if any workarounds were needed but do NOT paste chunks of terminal output.</p>\n";
echo "<p>Please write information in proper English with correct grammar and punctuation!</p>\n"; echo "<p>Please write information in proper English with correct grammar and punctuation!</p>\n";
echo "<b><span style=\"color:red\">Please only submit applications/versions that you have tested.\n"; echo "<b><span style=\"color:red\">Please only submit OSes/versions that you have tested.\n";
echo "Submissions without test information or not using the provided template will be rejected.\n"; echo "Submissions without test information or not using the provided template will be rejected.\n";
echo "If you are unable to see the in-browser editors below, please try Firefox, Mozilla or Opera browsers.\n</span></b>"; echo "If you are unable to see the in-browser editors below, please try Firefox, Mozilla or Opera browsers.\n</span></b>";
echo "<p>After your application has been added, you will be able to submit screenshots for it, post"; echo "<p>After your OS has been added, you will be able to submit screenshots for it, post";
echo " messages in its forums or become a maintainer to help others trying to run the application.</p>"; echo " messages in its forums or become a maintainer to help others trying to run the OS.</p>";
} }
} }

8
include/application_queue.php
View File

@@ -199,7 +199,7 @@ class application_queue
{ {
echo "<div style='margin:auto; width: 500px; border:1px solid; background-color:#eee; padding:2px; '>\n"; echo "<div style='margin:auto; width: 500px; border:1px solid; background-color:#eee; padding:2px; '>\n";
echo "<div style='font-weight:bold; padding:3px;'>\n"; echo "<div style='font-weight:bold; padding:3px;'>\n";
echo "Application name:\n"; echo "OS name:\n";
echo "</div>\n"; echo "</div>\n";
echo "<div style='padding:5px;'>\n"; echo "<div style='padding:5px;'>\n";
echo "<center><input type=\"text\" name=\"sAppName\" style='width:485px;'></center>\n"; echo "<center><input type=\"text\" name=\"sAppName\" style='width:485px;'></center>\n";
@@ -210,7 +210,7 @@ class application_queue
} else } else
{ {
/* Show potential duplicates */ /* Show potential duplicates */
echo html_frame_start("Potential duplicate applications in the ". echo html_frame_start("Potential duplicate OSes in the ".
"database","90%","",0); "database","90%","",0);
$this->displayDuplicates(); $this->displayDuplicates();
echo html_frame_end("&nbsp;"); echo html_frame_end("&nbsp;");
@@ -248,7 +248,7 @@ class application_queue
else else
$shPreviewApp = ' checked="checked"'; $shPreviewApp = ' checked="checked"';
echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewApp value=\"false\"> Preview application<br>\n"; echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewApp value=\"false\"> Preview OS<br>\n";
echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewVersion value=\"true\"> Preview version\n"; echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewVersion value=\"true\"> Preview version\n";
echo html_frame_end(); echo html_frame_end();
} }
@@ -311,7 +311,7 @@ class application_queue
} }
$aHeader = array( $aHeader = array(
"Application name", "OS name",
"Description", "Description",
"No. versions" "No. versions"
); );

2
include/bugs.php
View File

@@ -238,7 +238,7 @@ class Bug
$sAppName." has been deleted."; $sAppName." has been deleted.";
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Application Database better for all users."; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }

2
include/comment.php
View File

@@ -647,7 +647,7 @@ class Comment {
if( $messageCount > 0 ) if( $messageCount > 0 )
{ {
echo '<p align="center">The following comments are owned by whoever posted them. WineHQ is not responsible for what they say.</p>'."\n"; echo '<p align="center">The following comments are owned by whoever posted them. claunia.com is not responsible for what they say.</p>'."\n";
} }
//start comments //start comments

8
include/distribution.php
View File

@@ -382,7 +382,7 @@ class distribution {
} }
break; break;
} }
$sMsg .= "We appreciate your help in making the Application Database better for all users."; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }
@@ -406,7 +406,7 @@ class distribution {
$oSubmitter = new User($this->iSubmitterId); $oSubmitter = new User($this->iSubmitterId);
$sMsg .= "This Distribution has been submitted by ".$oSubmitter->sRealname."."; $sMsg .= "This Distribution has been submitted by ".$oSubmitter->sRealname.".";
$sMsg .= "\n"; $sMsg .= "\n";
$sMsg .= "Appdb admin reply text:\n"; $sMsg .= "OS DB admin reply text:\n";
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
} }
addmsg("The Distribution was successfully added into the database.", "green"); addmsg("The Distribution was successfully added into the database.", "green");
@@ -681,10 +681,10 @@ class distribution {
echo '<table width="100%" border="1">',"\n"; echo '<table width="100%" border="1">',"\n";
echo '<thead class="historyHeader">',"\n"; echo '<thead class="historyHeader">',"\n";
echo '<tr>',"\n"; echo '<tr>',"\n";
echo '<td>Application Version</td>',"\n"; echo '<td>OS Version</td>',"\n";
echo '<td>Submitter</td>',"\n"; echo '<td>Submitter</td>',"\n";
echo '<td>Date Submitted</td>',"\n"; echo '<td>Date Submitted</td>',"\n";
echo '<td>Wine version</td>',"\n"; echo '<td>QEMU version</td>',"\n";
echo '<td>Installs?</td>',"\n"; echo '<td>Installs?</td>',"\n";
echo '<td>Runs?</td>',"\n"; echo '<td>Runs?</td>',"\n";
echo '<td>Rating</td>',"\n"; echo '<td>Rating</td>',"\n";

2
include/form_new.php
View File

@@ -23,7 +23,7 @@ The password will be sent to your e-mail
</tr> </tr>
<?php <?php
echo "<tr><td class=color1>&nbsp; Wine version </td><td class=color0>"; echo "<tr><td class=color1>&nbsp; QEMU version </td><td class=color0>";
echo make_bugzilla_version_list("sWineRelease", isset($aClean['sWineRelease']) ? $aClean['sWineRelease'] : ''); echo make_bugzilla_version_list("sWineRelease", isset($aClean['sWineRelease']) ? $aClean['sWineRelease'] : '');
echo "</td></tr>"; echo "</td></tr>";

5
include/header.php
View File

@@ -12,7 +12,7 @@
<meta name="description" content="Open Source Software for system and runtime emulation."> <meta name="description" content="Open Source Software for system and runtime emulation.">
<meta name="keywords" content="windows, linux, macintosh, solaris, freebsd, qemu"> <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd, qemu">
<meta name="robots" content="index, follow"> <meta name="robots" content="index, follow">
<meta name="copyright" content="Copyright QEMU & Claunia.com All Rights Reserved."> <meta name="copyright" content="Copyright QEMU &amp; Claunia.com All Rights Reserved.">
<meta name="language" content="English"> <meta name="language" content="English">
<meta name="revisit-after" content="1"> <meta name="revisit-after" content="1">
<link rel="stylesheet" href="<?php echo BASE; ?>styles.css" type="text/css" media="screen"> <link rel="stylesheet" href="<?php echo BASE; ?>styles.css" type="text/css" media="screen">
@@ -27,6 +27,9 @@
<body> <body>
<div id="logo_glass"><a href="<?php echo BASE; ?>"></a></div>
<div id="logo_text"><a href="<?php echo BASE; ?>">QEMU</a></div>
<div id="logo_blurb"><?php echo preg_replace("/^ - /", "", $title); ?></div> <div id="logo_blurb"><?php echo preg_replace("/^ - /", "", $title); ?></div>
<div id="tabs"> <div id="tabs">

2
include/incl.php
View File

@@ -22,7 +22,7 @@ require_once(BASE."include/objectManager.php");
if(get_magic_quotes_gpc()) if(get_magic_quotes_gpc())
{ {
echo "<b>Please disable the magic quotes GPC PHP setting. See <a href=\"http://us2.php.net/manual/en/ref.info.php#ini.magic-quotes-gpc\"> this page</a> for more information</b><br><br>"; echo "<b>Please disable the magic quotes GPC PHP setting. See <a href=\"http://us2.php.net/manual/en/ref.info.php#ini.magic-quotes-gpc\"> this page</a> for more information</b><br><br>";
echo "AppDB php code assumes magic quotes are disabled.<br><br>"; echo "OS DB php code assumes magic quotes are disabled.<br><br>";
echo "Magic quotes are a bad idea for a few reasons.<br><br>"; echo "Magic quotes are a bad idea for a few reasons.<br><br>";
echo "First is that php calls <b>addslashes()</b> on all \$_POST, \$_REQUEST and cookie variables "; echo "First is that php calls <b>addslashes()</b> on all \$_POST, \$_REQUEST and cookie variables ";
echo "if magic quotes is enabled. "; echo "if magic quotes is enabled. ";

4
include/mail.php
View File

@@ -19,7 +19,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
$sMsg = trim(ereg_replace("\r\n","\n",$sMsg)); $sMsg = trim(ereg_replace("\r\n","\n",$sMsg));
$sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n"; $sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n";
$sMsg .= "Best regards.\n"; $sMsg .= "Best regards.\n";
$sMsg .= "The QEMU team\n"; $sMsg .= "The QEMU OS Database team\n";
$sMsg .= APPDB_ROOT."\n"; $sMsg .= APPDB_ROOT."\n";
$sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n"; $sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n";
$sMsg .= APPDB_ROOT."preferences.php\n"; $sMsg .= APPDB_ROOT."preferences.php\n";
@@ -37,7 +37,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
} }
$sMsg = html_entity_decode($sMsg); $sMsg = html_entity_decode($sMsg);
$bResult = mail(APPDB_SENDER_EMAIL, "[QEMU OSDB] ".$sSubject, $sMsg, $sHeaders, $bResult = mail(APPDB_SENDER_EMAIL, "[QEMU OS DB] ".$sSubject, $sMsg, $sHeaders,
"-f".APPDB_SENDER_EMAIL); "-f".APPDB_SENDER_EMAIL);
if($bResult) if($bResult)
addmsg("E-mail sent", "green"); addmsg("E-mail sent", "green");

62
include/maintainer.php
View File

@@ -276,11 +276,11 @@ class maintainer
$sName = $oApp->sName; $sName = $oApp->sName;
} }
$sSubject = "Application Maintainer Request Report"; $sSubject = "OS Maintainer Request Report";
$sMsg = "Your application to be the maintainer of $sName has been accepted.\n"; $sMsg = "Your application to be the maintainer of $sName has been accepted.\n";
$sMsg .= "$sURL\n"; $sMsg .= "$sURL\n";
$sMsg .= "$this->sReplyText\n"; $sMsg .= "$this->sReplyText\n";
$sMsg .= "We appreciate your help in making the Application Database better for all users.\n\n"; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.\n\n";
mail_appdb($sEmail, $sSubject ,$sMsg); mail_appdb($sEmail, $sSubject ,$sMsg);
} }
@@ -292,9 +292,9 @@ class maintainer
query_parameters("DELETE from appMaintainers WHERE userId = '?' AND maintainerId = '?' AND state = 'queued'", $this->iUserId, $this->iMaintainerId); query_parameters("DELETE from appMaintainers WHERE userId = '?' AND maintainerId = '?' AND state = 'queued'", $this->iUserId, $this->iMaintainerId);
if($oUser->isSuperMaintainer($this->iAppId) && !$this->bSuperMaintainer) if($oUser->isSuperMaintainer($this->iAppId) && !$this->bSuperMaintainer)
$sStatusMessage = "<p>User is already a super maintainer of this application</p>\n"; $sStatusMessage = "<p>User is already a super maintainer of this OS</p>\n";
else else
$sStatusMessage = "<p>User is already a maintainer/super maintainer of this application/version</p>\n"; $sStatusMessage = "<p>User is already a maintainer/super maintainer of this OS/version</p>\n";
} }
/* Delete any maintainer entries the user had for the application's versions, /* Delete any maintainer entries the user had for the application's versions,
@@ -313,11 +313,11 @@ class maintainer
{ {
$oApp = new Application($oRow->appId); $oApp = new Application($oRow->appId);
$oVersion = new Version($oRow->versionId); $oVersion = new Version($oRow->versionId);
$sSubject = "Application Maintainer Request Report"; $sSubject = "OS Maintainer Request Report";
$sMsg = "Your application to be the maintainer of ".$oApp->sName." ".$oVersion->sName." was rejected. "; $sMsg = "Your application to be the maintainer of ".$oApp->sName." ".$oVersion->sName." was rejected. ";
$sMsg .= $this->sReplyText; $sMsg .= $this->sReplyText;
$sMsg .= ""; $sMsg .= "";
$sMsg .= "-The AppDB admins\n"; $sMsg .= "-The OS DB admins\n";
mail_appdb($sEmail, $sSubject ,$sMsg); mail_appdb($sEmail, $sSubject ,$sMsg);
} }
@@ -640,7 +640,7 @@ class maintainer
{ {
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date"); $oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Application Name"); $oTableRow->AddTextCell("OS Name");
$oTableRow->AddTextCell("Version"); $oTableRow->AddTextCell("Version");
$oTableRow->AddTextCell("Super maintainer?"); $oTableRow->AddTextCell("Super maintainer?");
$oTableRow->AddTextCell("Submitter"); $oTableRow->AddTextCell("Submitter");
@@ -667,23 +667,23 @@ class maintainer
function objectDisplayAddItemHelp($aClean) function objectDisplayAddItemHelp($aClean)
{ {
echo "<p>This page is for submitting a request to become an application maintainer.\n"; echo "<p>This page is for submitting a request to become an OS maintainer.\n";
echo "An application maintainer is someone who runs the application \n"; echo "An OS maintainer is someone who runs the OS \n";
echo "regularly and who is willing to be active in reporting regressions with newer \n"; echo "regularly and who is willing to be active in reporting regressions with newer \n";
echo "versions of Wine and to help other users run this application under Wine.</p>"; echo "versions of QEMU and to help other users run this OS under QEMU.</p>";
echo "<p>Being an application maintainer comes with new rights and new responsibilities; please be sure to read the <a href=\"".BASE."/help/?sTopic=maintainer_guidelines\">maintainer's guidelines</a> before to proceed.</p> "; echo "<p>Being an OS maintainer comes with new rights and new responsibilities; please be sure to read the <a href=\"".BASE."/help/?sTopic=maintainer_guidelines\">maintainer's guidelines</a> before to proceed.</p> ";
echo "<p>We ask that all maintainers explain why they want to be an application maintainer,\n"; echo "<p>We ask that all maintainers explain why they want to be an OS maintainer,\n";
echo "why they think they will do a good job and a little about their experience\n"; echo "why they think they will do a good job and a little about their experience\n";
echo "with Wine. This is both to give you time to\n"; echo "with Wine. This is both to give you time to\n";
echo "think about whether you really want to be an application maintainer and also for the\n"; echo "think about whether you really want to be an OS maintainer and also for the\n";
echo "appdb admins to identify people that are best suited for the job. Your request\n"; echo "OS DB admins to identify people that are best suited for the job. Your request\n";
echo "may be denied if there are already a handful of maintainers for this application or if you\n"; echo "may be denied if there are already a handful of maintainers for this OS or if you\n";
echo "don't have the experience with Wine that is necessary to help other users out.</p>\n"; echo "don't have the experience with Wine that is necessary to help other users out.</p>\n";
if(!$aClean['iVersionId']) if(!$aClean['iVersionId'])
{ {
echo "<p>Super maintainers are just like normal maintainers but they can modify EVERY version of\n"; echo "<p>Super maintainers are just like normal maintainers but they can modify EVERY version of\n";
echo "this application (and the application itself). We don't expect you to run every version but at least to help keep\n"; echo "this OS (and the OS itself). We don't expect you to run every version but at least to help keep\n";
echo "the forums clean of stale and out-of-date information.</p>\n"; echo "the forums clean of stale and out-of-date information.</p>\n";
} }
@@ -742,7 +742,7 @@ class maintainer
echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
echo "<tr valign=top><td class=color0>"; echo "<tr valign=top><td class=color0>";
echo '<b>Application</b></td><td>'.$oApp->sName; echo '<b>OS</b></td><td>'.$oApp->sName;
echo '</td></tr>',"\n"; echo '</td></tr>',"\n";
if($aClean['iVersionId']) if($aClean['iVersionId'])
{ {
@@ -757,9 +757,9 @@ class maintainer
echo "<input type='hidden' name='iSuperMaintainer' value='$iSuperMaintainer'>"; echo "<input type='hidden' name='iSuperMaintainer' value='$iSuperMaintainer'>";
if($iSuperMaintainer) if($iSuperMaintainer)
echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n"; echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an OS super maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n";
else else
echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an application maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n"; echo '<tr valign="top"><td class="color0"><b>Why you want to and should<br>be an OS maintainer</b></td><td><textarea name="sMaintainReason" rows="15" cols="70"></textarea></td></tr>',"\n";
echo '</table>',"\n"; echo '</table>',"\n";
} else } else
@@ -828,7 +828,7 @@ class maintainer
echo "</td></tr>\n"; echo "</td></tr>\n";
// Show which other apps the user maintains // Show which other apps the user maintains
echo '<tr valign="top"><td class="color0" style=\'text-align:right\'><b>This user also maintains these apps:</b>'; echo '<tr valign="top"><td class="color0" style=\'text-align:right\'><b>This user also maintains these OSes:</b>';
echo "<br /><a href=\"".BASE."objectManager.php?sClass=maintainerView". echo "<br /><a href=\"".BASE."objectManager.php?sClass=maintainerView".
"&iId={$this->iUserId}&sTitle=Maintained+Apps\">Detailed view</a>"; "&iId={$this->iUserId}&sTitle=Maintained+Apps\">Detailed view</a>";
echo '</td><td>',"\n"; echo '</td><td>',"\n";
@@ -848,7 +848,7 @@ class maintainer
} }
} else } else
{ {
echo "User maintains no other applications"; echo "User maintains no other OSes.";
} }
echo "</td></tr>\n"; echo "</td></tr>\n";
@@ -860,13 +860,13 @@ class maintainer
echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$oVersion->iVersionId."\">\n"; echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$oVersion->iVersionId."\">\n";
//app name //app name
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Name:</b></td>',"\n"; echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>OS Name:</b></td>',"\n";
echo "<td>".$oApp->objectMakeLink()."</td></tr>\n"; echo "<td>".$oApp->objectMakeLink()."</td></tr>\n";
//version //version
if($oVersion->iVersionId) if($oVersion->iVersionId)
{ {
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Version:</b></td>',"\n"; echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>OS Version:</b></td>',"\n";
echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n"; echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n";
} }
@@ -1137,7 +1137,7 @@ class maintainer
{ {
$oApp = new Application($this->iAppId); $oApp = new Application($this->iAppId);
$sSubject.= $oApp->sName; $sSubject.= $oApp->sName;
$sMsg.='application, '.$oApp->sName.'('.$oApp->objectMakeUrl().'), that you maintain.'."\n\n"; $sMsg.='OS, '.$oApp->sName.'('.$oApp->objectMakeUrl().'), that you maintain.'."\n\n";
} else } else
{ {
$sFullname = version::fullName($this->iVersionId); $sFullname = version::fullName($this->iVersionId);
@@ -1182,7 +1182,7 @@ class maintainer
// FIXME: should use a function to generate these urls and use it here and // FIXME: should use a function to generate these urls and use it here and
// in sidebar_maintainer.php and sidebar_admin.php // in sidebar_maintainer.php and sidebar_admin.php
$sMsg = 'Please visit the version queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&amp;bIsQueue=true&amp;sTitle=". $sMsg = 'Please visit the version queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&amp;bIsQueue=true&amp;sTitle=".
'Version%20Queue) to process queued versions for applications you maintain.'."\n"; 'Version%20Queue) to process queued versions for OSes you maintain.'."\n";
} }
////////////////// //////////////////
@@ -1221,7 +1221,7 @@ class maintainer
// FIXME: should use a function to generate these urls and use it here and // FIXME: should use a function to generate these urls and use it here and
// in sidebar_maintainer.php and sidebar_admin.php // in sidebar_maintainer.php and sidebar_admin.php
$sMsg .= 'Please visit the AppDB Test Data Queue'. $sMsg .= 'Please visit the OS DB Test Data Queue'.
'('.APPDB_ROOT.'objectManager.php?sClass=testData_queue&amp;'. '('.APPDB_ROOT.'objectManager.php?sClass=testData_queue&amp;'.
'bIsQueue=true&amp;sTitle=Test%20Results%20Queue)'. 'bIsQueue=true&amp;sTitle=Test%20Results%20Queue)'.
' to process queued test data for versions you maintain.'."\n"; ' to process queued test data for versions you maintain.'."\n";
@@ -1334,9 +1334,9 @@ class maintainer
// we'll have to remove their maintainership for this application/version // we'll have to remove their maintainership for this application/version
// so a more active person can fill the spot // so a more active person can fill the spot
$oNotificationUpdate->sMsg.= "\nThis your second notification of queued entries."; $oNotificationUpdate->sMsg.= "\nThis your second notification of queued entries.";
$oNotificationUpdate->sMsg.= " If the queued entries are not processsed within"; $oNotificationUpdate->sMsg.= " If the queued entries are not processed within";
$oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. " days we will"; $oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. " days we will";
$oNotificationUpdate->sMsg.= " remove your maintainership for this application/version"; $oNotificationUpdate->sMsg.= " remove your maintainership for this OS/version";
$oNotificationUpdate->sMsg.= " so a more active person can fill the spot.". $oNotificationUpdate->sMsg.= " so a more active person can fill the spot.".
" It's important to process queued items in a timely manner". " It's important to process queued items in a timely manner".
" to provide a good user experience."; " to provide a good user experience.";
@@ -1345,7 +1345,7 @@ class maintainer
$oNotificationUpdate->sMsg.= "\nThis your third notification of queued entries."; $oNotificationUpdate->sMsg.= "\nThis your third notification of queued entries.";
$oNotificationUpdate->sMsg.= " Because your queued entries have not been processed"; $oNotificationUpdate->sMsg.= " Because your queued entries have not been processed";
$oNotificationUpdate->sMsg.= " after two notifications we are removing your maintainer"; $oNotificationUpdate->sMsg.= " after two notifications we are removing your maintainer";
$oNotificationUpdate->sMsg.= " role for this application/version. Removing inactive"; $oNotificationUpdate->sMsg.= " role for this OS/version. Removing inactive";
$oNotificationUpdate->sMsg.= " maintainers makes our job easier, since we want to know" $oNotificationUpdate->sMsg.= " maintainers makes our job easier, since we want to know"
." not to wait for a maintainer to oversee submissions."; ." not to wait for a maintainer to oversee submissions.";
$oNotificationUpdate->sMsg.= " If you are still interested in being a maintainer please"; $oNotificationUpdate->sMsg.= " If you are still interested in being a maintainer please";
@@ -1356,8 +1356,8 @@ class maintainer
// common end of our message // common end of our message
$oNotificationUpdate->sMsg.= "\n\nThanks,\n"; $oNotificationUpdate->sMsg.= "\n\nThanks,\n";
$oNotificationUpdate->sMsg.= "Appdb Admins\n"; $oNotificationUpdate->sMsg.= "OS Database Admins\n";
$oNotificationUpdate->sMsg.= "<appdb@winehq.org>"; $oNotificationUpdate->sMsg.= "<natalia@claunia.com>";
// save the notification level and notification time back into the database // save the notification level and notification time back into the database
$sQuery = "update appMaintainers set notificationLevel = '?', notificationTime = ?". $sQuery = "update appMaintainers set notificationLevel = '?', notificationTime = ?".

10
include/maintainerView.php
View File

@@ -80,23 +80,23 @@ class maintainerView
if(!$aMaintainedApps || !sizeof($aMaintainedApps)) if(!$aMaintainedApps || !sizeof($aMaintainedApps))
{ {
if($this->bViewingSelf) if($this->bViewingSelf)
echo '<p>You do not maintain any apps</p>'; echo '<p>You do not maintain any OSes</p>';
else else
echo "<p>{$oUser->sRealname} does not maintain any apps</p>"; echo "<p>{$oUser->sRealname} does not maintain any OSes</p>";
return; return;
} }
if($this->bViewingSelf) if($this->bViewingSelf)
echo '<p>Viewing your maintained apps</p>'; echo '<p>Viewing your maintained OSes:</p>';
else else
echo "<p>Viewing {$oUser->sRealname}'s maintained apps</p>"; echo "<p>Viewing {$oUser->sRealname}'s maintained OSes:</p>";
$oTable = new Table(); $oTable = new Table();
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->setClass('color4'); $oTableRow->setClass('color4');
$oTable->setCellSpacing(0); $oTable->setCellSpacing(0);
$oTable->setCellPadding(3); $oTable->setCellPadding(3);
$oTableRow->AddTextCell('Application'); $oTableRow->AddTextCell('OS');
$oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Version');
$oTableRow->AddTextCell('Current Rating'); $oTableRow->AddTextCell('Current Rating');
$oTableRow->AddTextCell('Current Version'); $oTableRow->AddTextCell('Current Version');

2
include/objectManager.php
View File

@@ -148,7 +148,7 @@ class ObjectManager
"problem you have with this app, if there are not bugs filed already". "problem you have with this app, if there are not bugs filed already".
" at http://bugs.winehq.org. If you want some advice or guidance on". " at http://bugs.winehq.org. If you want some advice or guidance on".
" this, please visit http://forum.winehq.org"; " this, please visit http://forum.winehq.org";
$this->aCommonResponses[] = "Please do not paste debug output in the AppDB,". $this->aCommonResponses[] = "Please do not paste debug output in the OS DB,".
" it belongs only as an attachment on bugzilla."; " it belongs only as an attachment on bugzilla.";
$this->aCommonResponses[] = "We appreciate your submission but it". $this->aCommonResponses[] = "We appreciate your submission but it".
" needs to be more detailed before it will be most useful to other users of". " needs to be more detailed before it will be most useful to other users of".

2
include/query.php
View File

@@ -155,7 +155,7 @@ function query_error($sQuery, $sComment, $hLink)
"mysql_error(): '".mysql_error($hLink)."' ". "mysql_error(): '".mysql_error($hLink)."' ".
"comment: '".$sComment."'"); "comment: '".$sComment."'");
$sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to appdb admins</b></p>"; $sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to OS DB admins</b></p>";
addmsg($sStatusMessage); addmsg($sStatusMessage);
$bInQueryError = false; // clear variable upon exit $bInQueryError = false; // clear variable upon exit

2
include/screenshot.php
View File

@@ -409,7 +409,7 @@ class screenshot
$sMsg = "The screenshot you submitted for ".$sAppName." has been rejected."; $sMsg = "The screenshot you submitted for ".$sAppName." has been rejected.";
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Application Database better for all users."; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }

52
include/testData.php
View File

@@ -454,7 +454,7 @@ class testData{
break; break;
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Application ". $sMsg .= "We appreciate your help in making the Operating Systems ".
"Database better for all users."; "Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
@@ -485,7 +485,7 @@ class testData{
} }
if($aClean['sReplyText']) if($aClean['sReplyText'])
{ {
$sMsg .= "Appdb admin reply text:\n"; $sMsg .= "OS DB admin reply text:\n";
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
} }
addmsg("The test data was successfully added into the database.", "green"); addmsg("The test data was successfully added into the database.", "green");
@@ -550,7 +550,7 @@ class testData{
$oTableRowHeader->AddTextCell(""); $oTableRowHeader->AddTextCell("");
$oTableRowHeader->AddTextCell("Distribution"); $oTableRowHeader->AddTextCell("Distribution");
$oTableRowHeader->AddTextCell("Test date"); $oTableRowHeader->AddTextCell("Test date");
$oTableRowHeader->AddTextCell("Wine version"); $oTableRowHeader->AddTextCell("QEMU version");
$oTableRowHeader->AddTextCell("Installs?"); $oTableRowHeader->AddTextCell("Installs?");
$oTableRowHeader->AddTextCell("Runs?"); $oTableRowHeader->AddTextCell("Runs?");
$oTableRowHeader->AddTextCell("Rating"); $oTableRowHeader->AddTextCell("Rating");
@@ -915,13 +915,13 @@ class testData{
echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n";
echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease);
// Give the user some information about our available versions // Give the user some information about our available versions
echo "<span>Version not listed? Your Wine is too old, <a href=\"http://winehq.org/download\">upgrade!</a></span>"; echo "<span>Version not listed? Your QEMU is too old, <a href=\"http://winehq.org/download\">upgrade!</a></span>";
echo '</td></tr>',"\n"; echo '</td></tr>',"\n";
// Installs // Installs
echo '<tr><td class=color0><b>Installs?</b></td><td class=color0>',"\n"; echo '<tr><td class=color0><b>Installs?</b></td><td class=color0>',"\n";
testData::make_Installs_list("sInstalls", $this->sInstalls); testData::make_Installs_list("sInstalls", $this->sInstalls);
echo '&nbsp; Installing is an important part of testing under Wine. Select N/A if there is no installer.</td></tr>',"\n"; echo '&nbsp; Installing is an important part of testing under QEMU. Select N/A if there is no installer.</td></tr>',"\n";
// Runs // Runs
echo '<tr><td class=color1><b>Runs?</b></td><td class=color0>',"\n"; echo '<tr><td class=color1><b>Runs?</b></td><td class=color0>',"\n";
testData::make_Runs_list("sRuns", $this->sRuns); testData::make_Runs_list("sRuns", $this->sRuns);
@@ -946,9 +946,9 @@ class testData{
if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') if(getInput('bConfirmTestedVersionChange', $aClean) != 'true')
{ {
echo '<tr><td class="color1">&nbsp;</td><td class="color0">'; echo '<tr><td class="color1">&nbsp;</td><td class="color0">';
echo 'You have changed the Wine version of the report. Are you sure you want to do this? Please submit a new test report for every Wine version you test; this is useful for tracking Wine\'s progress.<br>'; echo 'You have changed the QEMU version of the report. Are you sure you want to do this? Please submit a new test report for every QEMU version you test; this is useful for tracking QEMU\'s progress.<br>';
echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true"> '; echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true"> ';
echo 'Yes, I want to change the Wine version'; echo 'Yes, I want to change the QEMU version';
echo '</td></tr>'; echo '</td></tr>';
} else } else
{ {
@@ -981,7 +981,7 @@ class testData{
$errors .= "<li>Please enter the date and time when you tested.</li>\n"; $errors .= "<li>Please enter the date and time when you tested.</li>\n";
if (empty($aValues['sTestedRelease'])) if (empty($aValues['sTestedRelease']))
$errors .= "<li>Please enter the version of Wine that you tested with.</li>\n"; $errors .= "<li>Please enter the version of QEMU that you tested with.</li>\n";
// Ask for confirmation if changing the tested Wine versions, becase we want users // Ask for confirmation if changing the tested Wine versions, becase we want users
// to submit new reports instead of updating existing ones when testing new Wines // to submit new reports instead of updating existing ones when testing new Wines
@@ -989,8 +989,8 @@ class testData{
if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) &&
getInput('bConfirmTestedVersionChange', $aValues) != 'true') getInput('bConfirmTestedVersionChange', $aValues) != 'true')
{ {
$errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. $errors .= '<li>Are you sure you want to change the QEMU version of the report? Please submit a new '.
'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. 'test report for every QEMU version you test; this is useful for tracking QEMU\'s progress. '.
'Tick the box above the submit button if you want to proceed</li>'; 'Tick the box above the submit button if you want to proceed</li>';
} }
@@ -999,29 +999,29 @@ class testData{
$errors .= "<li>Please enter a distribution.</li>\n"; $errors .= "<li>Please enter a distribution.</li>\n";
if (empty($aValues['sInstalls'])) if (empty($aValues['sInstalls']))
$errors .= "<li>Please enter whether this application installs or not.</li>\n"; $errors .= "<li>Please enter whether this OS installs or not.</li>\n";
if (empty($aValues['sRuns'])) if (empty($aValues['sRuns']))
$errors .= "<li>Please enter whether this application runs or not.</li>\n"; $errors .= "<li>Please enter whether this OS runs or not.</li>\n";
if (empty($aValues['sTestedRating'])) if (empty($aValues['sTestedRating']))
$errors .= "<li>Please enter a rating based on how well this application runs.</li>\n"; $errors .= "<li>Please enter a rating based on how well this OS runs.</li>\n";
// Basic checking of rating logic to ensure that the users test results // Basic checking of rating logic to ensure that the users test results
// are consistent // are consistent
if (($aValues['sRuns'] != "Yes") && ($aValues['sTestedRating'] != GARBAGE_RATING)) if (($aValues['sRuns'] != "Yes") && ($aValues['sTestedRating'] != GARBAGE_RATING))
$errors .= "<li>Applications that do not run should be rated &#8216;Garbage&#8217;.</li>\n"; $errors .= "<li>OSes that do not run should be rated &#8216;Garbage&#8217;.</li>\n";
if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING)) if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING))
$errors .= "<li>An application can only get a Platinum rating if it installs and runs &#8216;out of the box&#8217;.</li>\n"; $errors .= "<li>An OS can only get a Platinum rating if it installs and runs &#8216;out of the box&#8217;.</li>\n";
// Basic checking of logic. Runs? can obviously only be 'Not Installable' // Basic checking of logic. Runs? can obviously only be 'Not Installable'
// if the application does not install // if the application does not install
if (($aValues['sInstalls'] != "No") && ($aValues['sRuns'] == "Not installable")) if (($aValues['sInstalls'] != "No") && ($aValues['sRuns'] == "Not installable"))
$errors .= "<li>You can only set Runs? to &#8216;Not installable&#8217; if the application's installer does not work</li>\n"; $errors .= "<li>You can only set Runs? to &#8216;Not installable&#8217; if the OS's installer does not work</li>\n";
if (($aValues['sInstalls'] == "No") && ($aValues['sRuns'] != "Not installable")) if (($aValues['sInstalls'] == "No") && ($aValues['sRuns'] != "Not installable"))
$errors .= "<li>You can only set Runs? to &#8216;Not installable&#8217;' if the application's installer does not work</li>\n"; $errors .= "<li>You can only set Runs? to &#8216;Not installable&#8217;' if the OS's installer does not work</li>\n";
return $errors; return $errors;
@@ -1122,7 +1122,7 @@ class testData{
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Version');
$oTableRow->AddTextCell('Rating'); $oTableRow->AddTextCell('Rating');
$oTableRow->AddTextCell('Wine version'); $oTableRow->AddTextCell('QEMU version');
$oTableRow->AddTextCell('Submission date'); $oTableRow->AddTextCell('Submission date');
if($bQueued) if($bQueued)
@@ -1315,7 +1315,7 @@ class testData{
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date"); $oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter"); $oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("OS");
$oTableRow->AddTextCell("Version"); $oTableRow->AddTextCell("Version");
$oTableRow->AddTextCell("Release"); $oTableRow->AddTextCell("Release");
$oTableRow->AddTextCell("Has maintainer"); $oTableRow->AddTextCell("Has maintainer");
@@ -1449,12 +1449,18 @@ class testData{
{ {
echo "<p>This is the screen for inputing test information so that others "; echo "<p>This is the screen for inputing test information so that others ";
echo "looking at the database will know \n"; echo "looking at the database will know \n";
echo "what was working on a particular release of Wine.</p>\n"; echo "what was working on a particular release of QEMU.</p>\n";
echo "<p><b>Please DO NOT include crash or Wine debug output.\n"; echo "<p><b>Please DO NOT include crash or QEMU debug output.\n";
echo " Instead report the crash as a bug in the Wine bugzilla at \n"; /*
echo "<a href=\"http://bugs.winehq.org\">http://bugs.winehq.org</a>.\n"; echo " Instead report the crash as a bug in the QEMU bugzilla at \n";
echo "<a href=\"http://bugs.claunia.com\">http://bugs.claunia.com</a>.\n";
echo "We ask that you use bugzilla because developers do not monitor the AppDB \n"; echo "We ask that you use bugzilla because developers do not monitor the AppDB \n";
echo "for bugs.</b></p>\n"; echo "for bugs.</b></p>\n";
*/
echo " Instead report the crash as a bug to the qemu-devel mailing list at \n";
echo "qemu-devel@nongnu.org. We ask that you use the mailing list because \n";
echo "developers do not monitor the OS DB for bugs.</b></p>\n";
echo "<p>Please be as detailed as you can but do not paste large \n"; echo "<p>Please be as detailed as you can but do not paste large \n";
echo "chunks of output from the terminal. Type out your report \n"; echo "chunks of output from the terminal. Type out your report \n";
echo "clearly and in proper English so that it is easily readable.</p>\n"; echo "clearly and in proper English so that it is easily readable.</p>\n";

4
include/url.php
View File

@@ -182,7 +182,7 @@ class Url {
return false; return false;
$oAppBefore = new Application($this->iAppId); $oAppBefore = new Application($this->iAppId);
$oAppAfter = new Application($iAppId); $oAppAfter = new Application($iAppId);
$sWhatChanged .= "Application was changed from ".$oAppBefore->sName." to ".$oAppAfter->sName.".\n\n"; $sWhatChanged .= "OS was changed from ".$oAppBefore->sName." to ".$oAppAfter->sName.".\n\n";
$this->iAppId = $iAppId; $this->iAppId = $iAppId;
} }
if($sWhatChanged && !$bSilent) if($sWhatChanged && !$bSilent)
@@ -209,7 +209,7 @@ class Url {
$sMsg = "The url you submitted for ".$sAppName." has been rejected."; $sMsg = "The url you submitted for ".$sAppName." has been rejected.";
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Application Database better for all users."; $sMsg .= "We appreciate your help in making the Operating Systems Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }

4
include/user.php
View File

@@ -425,13 +425,13 @@ class User {
if($this->isMaintainer()) if($this->isMaintainer())
{ {
$sSubject = "Warning: inactivity detected"; $sSubject = "Warning: inactivity detected";
$sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg = "You didn't log in in the past six months to the OS DB.\r\n";
$sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n"; $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n";
$sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n"; $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n";
} else } else
{ {
$sSubject = "Warning: inactivity detected"; $sSubject = "Warning: inactivity detected";
$sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg = "You didn't log in in the past six months to the OS DB.\r\n";
$sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n"; $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n";
} }
$sMsg .= APPDB_ROOT."account.php?sCmd=login\r\n"; $sMsg .= APPDB_ROOT."account.php?sCmd=login\r\n";

16
include/version.php
View File

@@ -219,7 +219,7 @@ class version {
$this->iAppId, $this->sState, $this->iVersionId)) $this->iAppId, $this->sState, $this->iVersionId))
return false; return false;
$sWhatChanged .= "Version was moved from application ".$oAppBefore->sName." to application ".$oAppAfter->sName.".\n\n"; $sWhatChanged .= "Version was moved from OS ".$oAppBefore->sName." to OS ".$oAppAfter->sName.".\n\n";
} }
if ($this->sLicense && ($this->sLicense!=$oVersion->sLicense)) if ($this->sLicense && ($this->sLicense!=$oVersion->sLicense))
@@ -476,14 +476,14 @@ class version {
$sSubject = "Submitted version rejected"; $sSubject = "Submitted version rejected";
$sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname.".";
$sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. "; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. ";
$sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= "A link to your queue of OSes and versions will also show up on the left hand side of the OS DB site once you have logged in. ";
$sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue". $sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue".
"&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iVersionId."&amp;". "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iVersionId."&amp;".
"sTitle=Edit+Version\n"; "sTitle=Edit+Version\n";
break; break;
} }
$sMsg .= $aClean['sReplyText']."\n"; $sMsg .= $aClean['sReplyText']."\n";
$sMsg .= "We appreciate your help in making the Version Database better for all users."; $sMsg .= "We appreciate your help in making the Application Database better for all users.";
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
} }
@@ -513,7 +513,7 @@ class version {
} }
if($aClean['sReplyText']) if($aClean['sReplyText'])
{ {
$sMsg .= "Appdb admin reply text:\n"; $sMsg .= "OS DB admin reply text:\n";
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
} }
@@ -634,7 +634,7 @@ class version {
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->SetValign("top"); $oTableRow->SetValign("top");
$oTableCell = new TableCell("Application"); $oTableCell = new TableCell("OS");
$oTableCell->SetBold(true); $oTableCell->SetBold(true);
$oTableRow->AddCell($oTableCell); $oTableRow->AddCell($oTableCell);
@@ -744,7 +744,7 @@ class version {
$errors = ""; $errors = "";
if (empty($aValues['sVersionName'])) if (empty($aValues['sVersionName']))
$errors .= "<li>Please enter an application version.</li>\n"; $errors .= "<li>Please enter an OS version.</li>\n";
if (empty($aValues['shVersionDescription'])) if (empty($aValues['shVersionDescription']))
$errors .= "<li>Please enter a version description.</li>\n"; $errors .= "<li>Please enter a version description.</li>\n";
@@ -1161,7 +1161,7 @@ class version {
echo html_note('No Test Results', echo html_note('No Test Results',
'This version has no test results, please consider submitting some.<br>'. 'This version has no test results, please consider submitting some.<br>'.
'They may be part of the '. 'They may be part of the '.
'version or application description. If they are, please '. 'version or OS description. If they are, please '.
'consider becoming a maintainer and remove them, submitting '. 'consider becoming a maintainer and remove them, submitting '.
'a proper test report instead.'); 'a proper test report instead.');
} }
@@ -1653,7 +1653,7 @@ class version {
$oTableRow->AddTextCell("Submission Date"); $oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter"); $oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Developer"); $oTableRow->AddTextCell("Developer");
$oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("OS");
$oTableRow->AddTextCell("Version"); $oTableRow->AddTextCell("Version");
$oTableRow->AddTextCell("Has Maintainer"); $oTableRow->AddTextCell("Has Maintainer");
return $oTableRow; return $oTableRow;

2
include/version_queue.php
View File

@@ -300,7 +300,7 @@ class version_queue
array("Version", 'width="80"'), array("Version", 'width="80"'),
"Description", "Description",
array("Rating", 'width="80"'), array("Rating", 'width="80"'),
array("Wine version", 'width="80"'), array("QEMU version", 'width="80"'),
array("Comments", 'width="40"'), array("Comments", 'width="40"'),
array("Move test results", 'width="80"') array("Move test results", 'width="80"')
), ),

6
index.php
View File

@@ -87,7 +87,7 @@ if(!$_SESSION['current']->isLoggedIn())
<div class="topx_style platinum"> <div class="topx_style platinum">
<div class="rating_header"> <div class="rating_header">
<div class="rating_title"> <div class="rating_title">
Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Platinum&sOrderBy=appName&bAscending=true">Platinum</a> List Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+OSes&iappVersion-ratingOp0=5&sappVersion-ratingData0=Platinum&sOrderBy=appName&bAscending=true">Platinum</a> List
</div> </div>
Operating systems which install and run flawlessly on QEMU with any hardware combination tested. Operating systems which install and run flawlessly on QEMU with any hardware combination tested.
</div> </div>
@@ -107,7 +107,7 @@ if(!$_SESSION['current']->isLoggedIn())
<div class="topx_style gold"> <div class="topx_style gold">
<div class="rating_header"> <div class="rating_header">
<div class="rating_title"> <div class="rating_title">
Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Gold&sOrderBy=appName&bAscending=true">Gold</a> List Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+OSes&iappVersion-ratingOp0=5&sappVersion-ratingData0=Gold&sOrderBy=appName&bAscending=true">Gold</a> List
</div> </div>
Operating systems that work flawlessly with some special configuration Operating systems that work flawlessly with some special configuration
</div> </div>
@@ -127,7 +127,7 @@ if(!$_SESSION['current']->isLoggedIn())
<div class="topx_style silver"> <div class="topx_style silver">
<div class="rating_header"> <div class="rating_header">
<div class="rating_title"> <div class="rating_title">
Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Silver&sOrderBy=appName&bAscending=true">Silver</a> List Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+OSes&iappVersion-ratingOp0=5&sappVersion-ratingData0=Silver&sOrderBy=appName&bAscending=true">Silver</a> List
</div> </div>
Operating systems with minor issues that do not affect typical usage Operating systems with minor issues that do not affect typical usage
</div> </div>

10
scripts.js
View File

@@ -71,10 +71,10 @@ function showComment(commentid)
var ratingdesc=[ var ratingdesc=[
"", "",
" Works flawlessly out of the box - no problems ", " Works flawlessly out of the box - no problems ",
" Works flawlessly with DLL overrides, third party software or other settings ", " Works flawlessly with workarounds or other settings ",
" Works excellently for normal use;works fine in singleplayer but not multi ", " Works excellently for normal use ",
" Works but has issues for normal use ", " Works but has issues for normal use ",
" Does not run or cannot be installed with Wine " " Does not run or cannot be installed with QEMU "
]; ];
var ratingstyle =[ var ratingstyle =[
"", "",
@@ -92,7 +92,7 @@ function showHint(o){
$('hint').addClassName(ratingstyle[o.selectedIndex]); $('hint').addClassName(ratingstyle[o.selectedIndex]);
} }
} }
/* too many people still call Wine "WINE" */ /* too many people still call QEMU "Qemu" */
function bind_tolowerWINE() function bind_tolowerWINE()
{ {
[ [
@@ -111,7 +111,7 @@ function bind_tolowerWINE()
} }
function tolowerWINE(o) function tolowerWINE(o)
{ {
o.element().value = o.element().value.replace(/WINE([^A-Z]+)|(WINE)$/g,"Wine$1"); o.element().value = o.element().value.replace(/Qemu([^A-Z]+)|(Qemu)$/g,"QEMU$1");
} }
/* executed when document is ready */ /* executed when document is ready */
document.observe("dom:loaded", function() { document.observe("dom:loaded", function() {

8
site_outage.html
View File

@@ -1,12 +1,12 @@
<html> <html>
<head> <head>
<title>AppDB temporarily offline</title> <title>OS DB temporarily offline</title>
</head> </head>
<body> <body>
<h1>Wine Application Database</h1> <h1>QEMU Official OS Support List</h1>
<h3>Sorry, the AppDB is temporarily offline</h3> <h3>Sorry, the OS DB is temporarily offline</h3>
<h3>While we are down you might want to checkout the main <h3>While we are down you might want to checkout the main
<a href="http://www.winehq.org">WineHQ site</h3> <a href="http://www.qemu.org">QEMU site</h3>
</body> </body>
</html> </html>