Rename 'vendor' to 'developer' on places visible to users
This commit is contained in:
committed by
Alexander Nicolaysen Sørnes
parent
fa2d3dc05a
commit
db87518ddc
@@ -225,7 +225,7 @@ class Application {
|
|||||||
return false;
|
return false;
|
||||||
$oVendorBefore = new Vendor($oApp->iVendorId);
|
$oVendorBefore = new Vendor($oApp->iVendorId);
|
||||||
$oVendorAfter = new Vendor($this->iVendorId);
|
$oVendorAfter = new Vendor($this->iVendorId);
|
||||||
$sWhatChanged .= "Vendor was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n";
|
$sWhatChanged .= "Developer was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->iCatId && ($this->iCatId!=$oApp->iCatId))
|
if ($this->iCatId && ($this->iCatId!=$oApp->iCatId))
|
||||||
@@ -594,7 +594,7 @@ class Application {
|
|||||||
if($this->iSubmitterId != $_SESSION['current']->iUserId)
|
if($this->iSubmitterId != $_SESSION['current']->iUserId)
|
||||||
{
|
{
|
||||||
$sVendorHelp .= "The user added a new one; review ".
|
$sVendorHelp .= "The user added a new one; review ".
|
||||||
"it in the vendor form below or ".
|
"it in the Developer form below or ".
|
||||||
"replace it with an existing one.";
|
"replace it with an existing one.";
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
@@ -605,7 +605,7 @@ class Application {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// vendor name
|
// vendor name
|
||||||
echo '<tr valign=top><td class="color0"><b>Vendor</b></td>',"\n";
|
echo '<tr valign=top><td class="color0"><b>Developer</b></td>',"\n";
|
||||||
echo "<td>$sVendorHelp</td></tr>\n";
|
echo "<td>$sVendorHelp</td></tr>\n";
|
||||||
|
|
||||||
// alt vendor
|
// alt vendor
|
||||||
@@ -672,7 +672,7 @@ class Application {
|
|||||||
|
|
||||||
// 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 vendor.</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 application.</li>\n";
|
||||||
@@ -763,7 +763,7 @@ class Application {
|
|||||||
$oCategory = new Category($this->iCatId);
|
$oCategory = new Category($this->iCatId);
|
||||||
$oCategory->display($this->iAppId);
|
$oCategory->display($this->iAppId);
|
||||||
|
|
||||||
// set Vendor
|
// set developer
|
||||||
$oVendor = new Vendor($this->iVendorId);
|
$oVendor = new Vendor($this->iVendorId);
|
||||||
|
|
||||||
// set URL
|
// set URL
|
||||||
@@ -777,7 +777,7 @@ class Application {
|
|||||||
|
|
||||||
echo ' <table width="250" border="0" cellpadding="3" cellspacing="1">',"\n";
|
echo ' <table width="250" border="0" cellpadding="3" cellspacing="1">',"\n";
|
||||||
echo " <tr class=color0 valign=top><td width=\"100\"><b>Name</b></td><td width='100%'> ".$this->sName." </td>\n";
|
echo " <tr class=color0 valign=top><td width=\"100\"><b>Name</b></td><td width='100%'> ".$this->sName." </td>\n";
|
||||||
echo " <tr class=\"color1\"><td><b>Vendor</b></td><td> ".
|
echo " <tr class=\"color1\"><td><b>Developer</b></td><td> ".
|
||||||
$oVendor->objectMakeLink()." \n";
|
$oVendor->objectMakeLink()." \n";
|
||||||
echo " </td></tr>\n";
|
echo " </td></tr>\n";
|
||||||
|
|
||||||
@@ -792,7 +792,7 @@ class Application {
|
|||||||
$img = Screenshot::get_random_screenshot_img($this->iAppId, null, false);
|
$img = Screenshot::get_random_screenshot_img($this->iAppId, null, false);
|
||||||
echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n";
|
echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n";
|
||||||
|
|
||||||
echo " </table>\n"; /* close of name/vendor/bugs/url table */
|
echo " </table>\n"; /* close of name/developer/bugs/url table */
|
||||||
|
|
||||||
echo " </td></tr>\n";
|
echo " </td></tr>\n";
|
||||||
echo " <tr><td>\n";
|
echo " <tr><td>\n";
|
||||||
@@ -916,7 +916,7 @@ class Application {
|
|||||||
$oTableRow = new TableRow();
|
$oTableRow = new TableRow();
|
||||||
$oTableRow->AddTextCell("Application");
|
$oTableRow->AddTextCell("Application");
|
||||||
$oTableRow->AddTextCell("Description");
|
$oTableRow->AddTextCell("Description");
|
||||||
$oTableRow->AddTextCell("Vendor");
|
$oTableRow->AddTextCell("Developer");
|
||||||
$oTableRow->AddTextCell("Submission Date");
|
$oTableRow->AddTextCell("Submission Date");
|
||||||
$oTableRow->SetClass("color4");
|
$oTableRow->SetClass("color4");
|
||||||
$oTable->SetHeader($oTableRow);
|
$oTable->SetHeader($oTableRow);
|
||||||
@@ -1130,7 +1130,7 @@ class Application {
|
|||||||
|
|
||||||
/* Only show submitter when processing queued entries */
|
/* Only show submitter when processing queued entries */
|
||||||
$oTableRow->AddTextCell('Submitter');
|
$oTableRow->AddTextCell('Submitter');
|
||||||
$oTableRow->AddSortableTextCell('Vendor', 'vendorName');
|
$oTableRow->AddSortableTextCell('Developer', 'vendorName');
|
||||||
$oTableRow->AddSortableTextCell('Application', 'appName');
|
$oTableRow->AddSortableTextCell('Application', 'appName');
|
||||||
}
|
}
|
||||||
return $oTableRow;
|
return $oTableRow;
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ class application_queue
|
|||||||
are processing an application and the vendor is queued */
|
are processing an application and the vendor is queued */
|
||||||
if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted')
|
if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted')
|
||||||
{
|
{
|
||||||
echo html_frame_start("New Vendor", "90%");
|
echo html_frame_start("New Developer", "90%");
|
||||||
$this->oVendor->outputEditor();
|
$this->oVendor->outputEditor();
|
||||||
echo html_frame_end();
|
echo html_frame_end();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
/**********************************/
|
/**********************************/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Vendor class for handling vendors.
|
* Vendor class for handling developers.
|
||||||
*/
|
*/
|
||||||
class Vendor {
|
class Vendor {
|
||||||
var $iVendorId;
|
var $iVendorId;
|
||||||
@@ -94,7 +94,7 @@ class Vendor {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
addmsg("Error while creating a new vendor.", "red");
|
addmsg("Error while creating a new developer.", "red");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -208,7 +208,7 @@ class Vendor {
|
|||||||
// name
|
// name
|
||||||
$oTableRow = new TableRow();
|
$oTableRow = new TableRow();
|
||||||
|
|
||||||
$oTableCell = new TableCell("Vendor Name:");
|
$oTableCell = new TableCell("Developer name:");
|
||||||
$oTableCell->SetAlign("right");
|
$oTableCell->SetAlign("right");
|
||||||
$oTableCell->SetClass("color0");
|
$oTableCell->SetClass("color0");
|
||||||
$oTableCell->SetBold(true);
|
$oTableCell->SetBold(true);
|
||||||
@@ -223,7 +223,7 @@ class Vendor {
|
|||||||
// Url
|
// Url
|
||||||
$oTableRow = new TableRow();
|
$oTableRow = new TableRow();
|
||||||
|
|
||||||
$oTableCell = new TableCell("Vendor URL:");
|
$oTableCell = new TableCell("Developer URL:");
|
||||||
$oTableCell->SetAlign("right");
|
$oTableCell->SetAlign("right");
|
||||||
$oTableCell->SetClass("color0");
|
$oTableCell->SetClass("color0");
|
||||||
$oTableCell->SetBold(true);
|
$oTableCell->SetBold(true);
|
||||||
@@ -372,17 +372,17 @@ class Vendor {
|
|||||||
|
|
||||||
function display()
|
function display()
|
||||||
{
|
{
|
||||||
echo 'Vendor Name: '.$this->sName,"\n";
|
echo 'Developer name: '.$this->sName,"\n";
|
||||||
if($this->canEdit())
|
if($this->canEdit())
|
||||||
{
|
{
|
||||||
echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&sAction=edit&".
|
echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&sAction=edit&".
|
||||||
"iId=$this->iVendorId&sTitle=Edit%20Vendor\">edit</a>]";
|
"iId=$this->iVendorId&sTitle=Edit%20Developer\">edit</a>]";
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '<br>',"\n";
|
echo '<br>',"\n";
|
||||||
if ($this->sWebpage)
|
if ($this->sWebpage)
|
||||||
{
|
{
|
||||||
echo 'Vendor URL: <a href="'.$this->sWebpage.'">'.
|
echo 'Developer URL: <a href="'.$this->sWebpage.'">'.
|
||||||
$this->sWebpage.'</a> <br>',"\n";
|
$this->sWebpage.'</a> <br>',"\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -409,7 +409,7 @@ class Vendor {
|
|||||||
/* Make a URL for viewing the specified vendor */
|
/* Make a URL for viewing the specified vendor */
|
||||||
function objectMakeUrl()
|
function objectMakeUrl()
|
||||||
{
|
{
|
||||||
$oManager = new objectManager("vendor", "View Vendor");
|
$oManager = new objectManager("vendor", "View Developer");
|
||||||
return $oManager->makeUrl("view", $this->iVendorId);
|
return $oManager->makeUrl("view", $this->iVendorId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1576,7 +1576,7 @@ class version {
|
|||||||
$oTableRow = new TableRow();
|
$oTableRow = new TableRow();
|
||||||
$oTableRow->AddTextCell("Submission Date");
|
$oTableRow->AddTextCell("Submission Date");
|
||||||
$oTableRow->AddTextCell("Submitter");
|
$oTableRow->AddTextCell("Submitter");
|
||||||
$oTableRow->AddTextCell("Vendor");
|
$oTableRow->AddTextCell("Developer");
|
||||||
$oTableRow->AddTextCell("Application");
|
$oTableRow->AddTextCell("Application");
|
||||||
$oTableRow->AddTextCell("Version");
|
$oTableRow->AddTextCell("Version");
|
||||||
$oTableRow->AddTextCell("Has Maintainer");
|
$oTableRow->AddTextCell("Has Maintainer");
|
||||||
|
|||||||
Reference in New Issue
Block a user