". substr($oRow->description,0,20). "\n";
- echo "
[
";
- echo $oApp->sName."]";
+ echo "
[".$oApp->objectMakeLink()."]";
- echo "
[
";
- echo "Version: ".$oVersion->sName."]";
+ echo "
[".$oVersion->objectMakeLink()."]";
//show admin delete link
if($_SESSION['current']->isLoggedIn() &&
diff --git a/admin/deleteAny.php b/admin/deleteAny.php
index 8279ab9..7679675 100644
--- a/admin/deleteAny.php
+++ b/admin/deleteAny.php
@@ -48,7 +48,10 @@ if($aClean['sWhat'])
if(!$oVersion->delete())
util_show_error_page_and_exit();
else
- util_redirect_and_exit(BASE."appview.php?iAppId=".$aClean['iAppId']);
+ {
+ $oApp = new application($aClean['iAppId']);
+ util_redirect_and_exit($oApp->objectMakeUrl());
+ }
break;
}
}
diff --git a/appview.php b/appview.php
index d2ba5ae..b284fd4 100644
--- a/appview.php
+++ b/appview.php
@@ -55,12 +55,13 @@ function display_bundle($iAppId)
$c = 0;
while($ob = mysql_fetch_object($hResult))
{
+ $oApp = new application($ob->appId);
//set row color
$bgcolor = ($c % 2 == 0) ? "color0" : "color1";
//display row
echo "
\n";
- echo " | appId\">".stripslashes($ob->appName)." | \n";
+ echo " ".$oApp->objectMakeLink()." | \n";
echo " ".util_trim_description($oApp->sDescription)." | \n";
echo "
\n\n";
@@ -85,7 +86,7 @@ if ($aClean['sSub'])
{
$oBuglink = new Bug($aClean['iBuglinkId']);
$oBuglink->delete();
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
}
@@ -97,7 +98,7 @@ if ($aClean['sSub'])
{
$oBuglink = new Bug($aClean['iBuglinkId']);
$oBuglink->unqueue();
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
}
@@ -105,13 +106,13 @@ if ($aClean['sSub'])
{
$oBuglink = new Bug();
$oBuglink->create($aClean['iVersionId'],$aClean['iBuglinkId']);
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
if($aClean['sSub'] == 'StartMonitoring')
{
$oMonitor = new Monitor();
$oMonitor->create($_SESSION['current']->iUserId,$aClean['iAppId'],$aClean['iVersionId']);
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
if($aClean['sSub'] == 'StopMonitoring')
{
@@ -121,7 +122,7 @@ if ($aClean['sSub'])
{
$oMonitor->delete();
}
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
}
diff --git a/deletecomment.php b/deletecomment.php
index a3104cd..3cf9aef 100644
--- a/deletecomment.php
+++ b/deletecomment.php
@@ -55,6 +55,7 @@ if($_SESSION['current']->getPref("confirm_comment_deletion") != "no" && !isset($
} else
{
$oComment->delete($aClean['sWhy']);
- util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$oComment->iVersionId));
+ $oVersion = new version($oComment->iVersionId);
+ util_redirect_and_exit($oVersion->objectMakeUrl());
}
?>
diff --git a/include/application.php b/include/application.php
index f91404c..111f3f6 100644
--- a/include/application.php
+++ b/include/application.php
@@ -443,7 +443,7 @@ class Application {
if($this->sQueued == 'false') // Has been accepted.
{
$sSubject = $this->sName." has been added by ".$_SESSION['current']->sRealname;
- $sMsg = APPDB_ROOT."appview.php?iAppId=".$this->iAppId."\n";
+ $sMsg = $this->objectMakeUrl()."\n";
if($this->iSubmitterId)
{
$oSubmitter = new User($this->iSubmitterId);
@@ -467,7 +467,7 @@ class Application {
break;
case "edit":
$sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname;
- $sMsg .= APPDB_ROOT."appview.php?iAppId=".$this->iAppId."\n";
+ $sMsg .= $this->objectMakeUrl()."\n";
addmsg("Application modified.", "green");
break;
case "delete":
@@ -810,8 +810,9 @@ class Application {
for($i = 1; $oRow = mysql_fetch_object($hResult); $i++)
{
$oVendor = new vendor($oRow->vendorId);
+ $oApp = new application($oRow->appId);
$sResult .= html_tr(array(
- "
appId\">$oRow->appName",
+ $oApp->objectMakeLink(),
$oRow->description,
$oVendor->objectMakeLink(),
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
diff --git a/include/bugs.php b/include/bugs.php
index 7291755..552f9a5 100644
--- a/include/bugs.php
+++ b/include/bugs.php
@@ -219,13 +219,14 @@ class Bug {
function SendNotificationMail($bDeleted=false)
{
- $sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId);
+ $sAppName = version::fullName($this->iVersionId);
+ $oVersion = new version($this->iVersionId);
if(!$bDeleted)
{
if(!$this->bQueued)
{
$sSubject = "Link between Bug ".$this->iBug_id." and ".$sAppName." added by ".$_SESSION['current']->sRealname;
- $sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
+ $sMsg = $oVersion->objectMakeUrl()."\n";
if($this->iSubmitterId)
{
$oSubmitter = new User($this->iSubmitterId);
@@ -236,7 +237,7 @@ class Bug {
} else // Bug Link queued.
{
$sSubject = "Link between Bug ".$this->iBug_id." and ".$sAppName." submitted by ".$_SESSION['current']->sRealname;
- $sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
+ $sMsg = $oVersion->objectMakeUrl()."\n";
$sMsg .= "This Bug Link has been queued.";
$sMsg .= "\n";
addmsg("The Bug Link you submitted will be added to the database after being reviewed.", "green");
@@ -244,7 +245,7 @@ class Bug {
} else // Bug Link deleted.
{
$sSubject = "Link between Bug ".$this->iBug_id." and ".$sAppName." deleted by ".$_SESSION['current']->sRealname;
- $sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
+ $sMsg = $oVersion->objectMakeUrl()."\n";
addmsg("Bug Link deleted.", "green");
}
@@ -277,7 +278,7 @@ class Bug {
{
$oBug = new Bug($oRow->bug_id);
$sReturn .= html_tr(array(
- "
versionId."\">".$oRow->appName.": ".$oRow->versionName."",
+ version::fullNameUrl($oRow->versionId),
"
bug_id."\">".$oRow->bug_id."",
$oBug->sBug_status,
$oBug->sResolution,
@@ -315,7 +316,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds)
//start format table
if($_SESSION['current']->isLoggedIn())
{
- echo "