From cecc4bf6c0a6cfd2d1815f10d11790a4a619eb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Sun, 1 Apr 2007 01:21:58 +0000 Subject: [PATCH] Use objectMakeLink() in more places --- appbrowse.php | 2 +- browse_by_rating.php | 2 +- browse_downloadable.php | 6 +++--- browse_newest_apps.php | 3 ++- include/sidebar_login.php | 7 ++++--- include/vendor.php | 3 +-- include/version.php | 2 +- include/vote.php | 6 +----- votestats.php | 3 +-- 9 files changed, 15 insertions(+), 19 deletions(-) diff --git a/appbrowse.php b/appbrowse.php index 0a2a940..7e1fd59 100644 --- a/appbrowse.php +++ b/appbrowse.php @@ -107,7 +107,7 @@ if($apps) //display row echo "\n"; - echo " ".$oApp->sName."\n"; + echo " ".$oApp->objectMakeLink()."\n"; echo " $desc  \n"; echo " ".sizeof($oApp->aVersionsIds)."\n"; echo "\n\n"; diff --git a/browse_by_rating.php b/browse_by_rating.php index 9b98793..a6f6ab5 100644 --- a/browse_by_rating.php +++ b/browse_by_rating.php @@ -160,7 +160,7 @@ if (empty($aClean['sRating'])) //display row echo "\n"; - echo " ".$oApp->sName."\n"; + echo " ".$oApp->objectMakeLink()."\n"; echo " $desc  \n"; echo " ".sizeof($oApp->aVersionsIds)."\n"; echo "\n\n"; diff --git a/browse_downloadable.php b/browse_downloadable.php index e142222..7d3c177 100644 --- a/browse_downloadable.php +++ b/browse_downloadable.php @@ -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 "versionId\">". - "$oRow->appName $oRow->versionName\n"; + echo "".version::fullNameLink($oVersion->iVersionId)."\n"; echo "$oRow->description\n"; echo "\n"; } diff --git a/browse_newest_apps.php b/browse_newest_apps.php index 996c727..26c538a 100644 --- a/browse_newest_apps.php +++ b/browse_newest_apps.php @@ -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 = "appId\"> $row->appName "; + $link = $oApp->objectMakeLink(); echo ""; echo "".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."\n"; echo "$link \n"; diff --git a/include/sidebar_login.php b/include/sidebar_login.php index 5072597..57aa9cd 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -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("".Application::lookup_name($appId)."*", "center"); + $g->addmisc($oApp->objectMakeLink()."*", "center"); else - $g->addmisc("".Application::lookup_name($appId)." ".Version::lookup_name($versionId)."", "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("".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."","center"); + $g->addmisc(version::fullNameLink($iVersionId),"center"); } /* Display a link to the user's queued items, diff --git a/include/vendor.php b/include/vendor.php index 8d578ea..d433d33 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -244,8 +244,7 @@ class Vendor { foreach($this->aApplicationsIds as $iAppId) { $oApp = new Application($iAppId); - echo '
  • '. - $oApp->sName.'
    • ',"\n"; + echo '
  • '.$oApp->objectMakeLink().'
    • ',"\n"; } echo '',"\n"; } diff --git a/include/version.php b/include/version.php index 7db4bd6..9691030 100644 --- a/include/version.php +++ b/include/version.php @@ -1037,7 +1037,7 @@ class Version { //display row echo "\n"; - echo " ".$oVersion->sName."\n"; + echo " ".$oVersion->objectMakeLink()."\n"; echo " ".util_trim_description($oVersion->sDescription)."\n"; echo " ".$oVersion->sTestedRating."\n"; echo " ".$oVersion->sTestedRelease."\n"; diff --git a/include/vote.php b/include/vote.php index ed5c68c..c07b510 100644 --- a/include/vote.php +++ b/include/vote.php @@ -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 = "". - "$sName"; - } + $str = Version::fullNameLink($votes[$i]->versionId); else $str = "No App Selected"; diff --git a/votestats.php b/votestats.php index 60c2d17..fdbee42 100644 --- a/votestats.php +++ b/votestats.php @@ -168,8 +168,7 @@ if($hResult) while($row = mysql_fetch_object($hResult)) { $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "$row->appName ". - "$row->versionName"; + $link = version::fullNameLink($row->versionId); echo "$c. $link $row->count ". "\n"; $c++;