ChangeSet ID: 31021 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner@winehq.org 2007/03/31 20:21:58
Modified files: . : appbrowse.php browse_by_rating.php browse_downloadable.php browse_newest_apps.php votestats.php include : sidebar_login.php vendor.php version.php vote.php
Log message: Alexander Nicolaysen Srnes alex@thehandofagony.com Use objectMakeLink() in more places
Patch: http://cvs.winehq.org/patch.py?id=31021
Old revision New revision Changes Path 1.23 1.24 +1 -1 appdb/appbrowse.php 1.2 1.3 +1 -1 appdb/browse_by_rating.php 1.3 1.4 +3 -3 appdb/browse_downloadable.php 1.3 1.4 +2 -1 appdb/browse_newest_apps.php 1.30 1.31 +1 -2 appdb/votestats.php 1.19 1.20 +4 -3 appdb/include/sidebar_login.php 1.20 1.21 +1 -2 appdb/include/vendor.php 1.108 1.109 +1 -1 appdb/include/version.php 1.25 1.26 +1 -5 appdb/include/vote.php
Index: appdb/appbrowse.php diff -u -p appdb/appbrowse.php:1.23 appdb/appbrowse.php:1.24 --- appdb/appbrowse.php:1.23 1 Apr 2007 1:21:58 -0000 +++ appdb/appbrowse.php 1 Apr 2007 1:21:58 -0000 @@ -107,7 +107,7 @@ if($apps) //display row 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 </td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo "</tr>\n\n"; Index: appdb/browse_by_rating.php diff -u -p appdb/browse_by_rating.php:1.2 appdb/browse_by_rating.php:1.3 --- appdb/browse_by_rating.php:1.2 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_by_rating.php 1 Apr 2007 1:21:58 -0000 @@ -160,7 +160,7 @@ if (empty($aClean['sRating'])) //display row 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 </td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo "</tr>\n\n"; Index: appdb/browse_downloadable.php diff -u -p appdb/browse_downloadable.php:1.3 appdb/browse_downloadable.php:1.4 --- appdb/browse_downloadable.php:1.3 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_downloadable.php 1 Apr 2007 1:21:58 -0000 @@ -113,13 +113,13 @@ if($hResult && mysql_num_rows($hResult))
for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) { + $oVersion = new version($oRow->versionId); echo html_tr_highlight_clickable( - "appview.php?iVersionId=$oRow->versionId", + $oVersion->objectMakeUrl(), ($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0"); - echo "<td><a href="appview.php?iVersionId=$oRow->versionId">". - "$oRow->appName $oRow->versionName</a></td>\n"; + echo "<td>".version::fullNameLink($oVersion->iVersionId)."</td>\n"; echo "<td>$oRow->description</td>\n"; echo "</tr>\n"; } Index: appdb/browse_newest_apps.php diff -u -p appdb/browse_newest_apps.php:1.3 appdb/browse_newest_apps.php:1.4 --- appdb/browse_newest_apps.php:1.3 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_newest_apps.php 1 Apr 2007 1:21:58 -0000 @@ -50,8 +50,9 @@ if($hResult) $c = 1; while($row = mysql_fetch_object($hResult)) { + $oApp = new application($row->appId); $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "<a href="appview.php?iAppId=$row->appId"> $row->appName </a>"; + $link = $oApp->objectMakeLink(); echo "<tr class="$bgcolor">"; echo "<td width="20%">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n"; echo "<td>$link </td>\n"; Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.30 appdb/votestats.php:1.31 --- appdb/votestats.php:1.30 1 Apr 2007 1:21:58 -0000 +++ appdb/votestats.php 1 Apr 2007 1:21:58 -0000 @@ -168,8 +168,7 @@ if($hResult) while($row = mysql_fetch_object($hResult)) { $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName ". - "$row->versionName</a>"; + $link = version::fullNameLink($row->versionId); echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ". "</td></tr>\n"; $c++; Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.19 appdb/include/sidebar_login.php:1.20 --- appdb/include/sidebar_login.php:1.19 1 Apr 2007 1:21:58 -0000 +++ appdb/include/sidebar_login.php 1 Apr 2007 1:21:58 -0000 @@ -27,10 +27,11 @@ function global_sidebar_login() { $g->addmisc("You maintain:\n"); while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains)) { + $oApp = new application($appId); if($superMaintainer) - $g->addmisc("<a href='".BASE."appview.php?iAppId=$appId'>".Application::lookup_name($appId)."*</a>", "center"); + $g->addmisc($oApp->objectMakeLink()."*", "center"); 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(); @@ -44,7 +45,7 @@ function global_sidebar_login() { $g->addmisc("You monitor:\n");
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, Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.20 appdb/include/vendor.php:1.21 --- appdb/include/vendor.php:1.20 1 Apr 2007 1:21:58 -0000 +++ appdb/include/vendor.php 1 Apr 2007 1:21:58 -0000 @@ -244,8 +244,7 @@ class Vendor { foreach($this->aApplicationsIds as $iAppId) { $oApp = new Application($iAppId); - echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'. - $oApp->sName.'</a> </li>',"\n"; + echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; } echo '</ol>',"\n"; } Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.108 appdb/include/version.php:1.109 --- appdb/include/version.php:1.108 1 Apr 2007 1:21:58 -0000 +++ appdb/include/version.php 1 Apr 2007 1:21:58 -0000 @@ -1037,7 +1037,7 @@ class Version {
//display row 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 $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; Index: appdb/include/vote.php diff -u -p appdb/include/vote.php:1.25 appdb/include/vote.php:1.26 --- appdb/include/vote.php:1.25 1 Apr 2007 1:21:58 -0000 +++ appdb/include/vote.php 1 Apr 2007 1:21:58 -0000 @@ -122,11 +122,7 @@ function vote_menu() for($i = 1;$i <= MAX_VOTES; $i++) { if(isset($votes[$i])) - { - $sName = Version::fullName($votes[$i]->versionId); - $str = "<a href='appview.php?iVersionId=".$votes[$i]->versionId."'>". - "$sName</a>"; - } + $str = Version::fullNameLink($votes[$i]->versionId); else $str = "No App Selected";