Use objectMakeLink() in more places

This commit is contained in:
Alexander Nicolaysen Sørnes
2007-04-01 01:21:58 +00:00
committed by WineHQ
parent 434ef17426
commit cecc4bf6c0
9 changed files with 15 additions and 19 deletions

View File

@@ -107,7 +107,7 @@ if($apps)
//display row //display row
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
echo " <td><a href='appview.php?iAppId=$iAppId'>".$oApp->sName."</a></td>\n"; echo " <td>".$oApp->objectMakeLink()."</td>\n";
echo " <td>$desc &nbsp;</td>\n"; echo " <td>$desc &nbsp;</td>\n";
echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";

View File

@@ -160,7 +160,7 @@ if (empty($aClean['sRating']))
//display row //display row
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
echo " <td><a href='appview.php?iAppId=$iAppId&sRating=".$aClean['sRating']."'>".$oApp->sName."</a></td>\n"; echo " <td>".$oApp->objectMakeLink()."</td>\n";
echo " <td>$desc &nbsp;</td>\n"; echo " <td>$desc &nbsp;</td>\n";
echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";

View File

@@ -113,13 +113,13 @@ if($hResult && mysql_num_rows($hResult))
for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) for($i = 1; $oRow = mysql_fetch_object($hResult); $i++)
{ {
$oVersion = new version($oRow->versionId);
echo html_tr_highlight_clickable( echo html_tr_highlight_clickable(
"appview.php?iVersionId=$oRow->versionId", $oVersion->objectMakeUrl(),
($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0",
($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0",
($i % 2) ? "color1" : "color0"); ($i % 2) ? "color1" : "color0");
echo "<td><a href=\"appview.php?iVersionId=$oRow->versionId\">". echo "<td>".version::fullNameLink($oVersion->iVersionId)."</td>\n";
"$oRow->appName $oRow->versionName</a></td>\n";
echo "<td>$oRow->description</td>\n"; echo "<td>$oRow->description</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }

View File

@@ -50,8 +50,9 @@ if($hResult)
$c = 1; $c = 1;
while($row = mysql_fetch_object($hResult)) while($row = mysql_fetch_object($hResult))
{ {
$oApp = new application($row->appId);
$bgcolor = ($c % 2) ? "color0" : "color1"; $bgcolor = ($c % 2) ? "color0" : "color1";
$link = "<a href=\"appview.php?iAppId=$row->appId\"> $row->appName </a>"; $link = $oApp->objectMakeLink();
echo "<tr class=\"$bgcolor\">"; echo "<tr class=\"$bgcolor\">";
echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n"; echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n";
echo "<td>$link </td>\n"; echo "<td>$link </td>\n";

View File

@@ -27,10 +27,11 @@ function global_sidebar_login() {
$g->addmisc("You maintain:\n"); $g->addmisc("You maintain:\n");
while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains)) while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains))
{ {
$oApp = new application($appId);
if($superMaintainer) if($superMaintainer)
$g->addmisc("<a href='".BASE."appview.php?iAppId=$appId'>".Application::lookup_name($appId)."*</a>", "center"); $g->addmisc($oApp->objectMakeLink()."*", "center");
else else
$g->addmisc("<a href='".BASE."appview.php?iVersionId=$versionId'>".Application::lookup_name($appId)." ".Version::lookup_name($versionId)."</a>", "center"); $g->addmisc(version::fullNameLink($versionId), "center");
} }
} }
$appsRejected = $_SESSION['current']->getAllRejectedApps(); $appsRejected = $_SESSION['current']->getAllRejectedApps();
@@ -44,7 +45,7 @@ function global_sidebar_login() {
$g->addmisc("You monitor:\n"); $g->addmisc("You monitor:\n");
while(list($i, list($iAppId, $iVersionId)) = each($aMonitored)) while(list($i, list($iAppId, $iVersionId)) = each($aMonitored))
$g->addmisc("<a href=\"".BASE."appview.php?iVersionId=$iVersionId\">".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."</a>","center"); $g->addmisc(version::fullNameLink($iVersionId),"center");
} }
/* Display a link to the user's queued items, /* Display a link to the user's queued items,

View File

@@ -244,8 +244,7 @@ class Vendor {
foreach($this->aApplicationsIds as $iAppId) foreach($this->aApplicationsIds as $iAppId)
{ {
$oApp = new Application($iAppId); $oApp = new Application($iAppId);
echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'. echo '<li>'.$oApp->objectMakeLink().'</li>',"\n";
$oApp->sName.'</a> </li>',"\n";
} }
echo '</ol>',"\n"; echo '</ol>',"\n";
} }

View File

@@ -1037,7 +1037,7 @@ class Version {
//display row //display row
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
echo " <td><a href=\"".BASE."appview.php?iVersionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n"; echo " <td>".$oVersion->objectMakeLink()."</td>\n";
echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n";
echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n";
echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n";

View File

@@ -122,11 +122,7 @@ function vote_menu()
for($i = 1;$i <= MAX_VOTES; $i++) for($i = 1;$i <= MAX_VOTES; $i++)
{ {
if(isset($votes[$i])) if(isset($votes[$i]))
{ $str = Version::fullNameLink($votes[$i]->versionId);
$sName = Version::fullName($votes[$i]->versionId);
$str = "<a href='appview.php?iVersionId=".$votes[$i]->versionId."'>".
"$sName</a>";
}
else else
$str = "No App Selected"; $str = "No App Selected";

View File

@@ -168,8 +168,7 @@ if($hResult)
while($row = mysql_fetch_object($hResult)) while($row = mysql_fetch_object($hResult))
{ {
$bgcolor = ($c % 2) ? "color0" : "color1"; $bgcolor = ($c % 2) ? "color0" : "color1";
$link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName ". $link = version::fullNameLink($row->versionId);
"$row->versionName</a>";
echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ". echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ".
"</td></tr>\n"; "</td></tr>\n";
$c++; $c++;