Use objectMakeUrl()/Link() in more places
This commit is contained in:
committed by
WineHQ
parent
9de4e9b63b
commit
169d7ca493
@@ -19,7 +19,8 @@ if(!empty($aClean['sSubmit']))
|
||||
{
|
||||
process_app_version_changes(false);
|
||||
url::processForm($aClean);
|
||||
util_redirect_and_exit(apidb_fullurl("appview.php?iAppId={$aClean['iAppId']}"));
|
||||
$oApp = new application($aClean['iAppId']);
|
||||
util_redirect_and_exit($oApp->objectMakeUrl());
|
||||
}
|
||||
else
|
||||
// Show the form for editing the Application Family
|
||||
@@ -52,7 +53,7 @@ else
|
||||
// URL editor
|
||||
echo url::outputEditor("editAppFamily.php", NULL, $oApp);
|
||||
|
||||
echo html_back_link(1,BASE."appview.php?iAppId=$oApp->iAppId");
|
||||
echo html_back_link(1,$oApp->objectMakeUrl());
|
||||
}
|
||||
|
||||
apidb_footer();
|
||||
|
||||
@@ -12,6 +12,7 @@ if(!is_numeric($aClean['iNoteId']))
|
||||
|
||||
/* Get note data */
|
||||
$oNote = new Note($aClean['iNoteId']);
|
||||
$oVersion = new version($oNote->iVersionId);
|
||||
|
||||
/* Check for privs */
|
||||
if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->isMaintainer($oNote->iVersionId) && !$_SESSION['current']->isSuperMaintainer($oNote->iAppId))
|
||||
@@ -29,7 +30,7 @@ if(!empty($aClean['sSub']))
|
||||
{
|
||||
$oNote->update();
|
||||
}
|
||||
util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId={$oNote->iVersionId}"));
|
||||
util_redirect_and_exit($oVersion->objectMakeUrl());
|
||||
} else /* display note */
|
||||
{
|
||||
// show form
|
||||
@@ -53,7 +54,7 @@ if(!empty($aClean['sSub']))
|
||||
echo '<input type="submit" name=sSub value="Delete"></td></tr>',"\n";
|
||||
echo '</center>';
|
||||
|
||||
echo html_back_link(1,BASE."appview.php?iVersionId=".$oNote->iVersionId);
|
||||
echo html_back_link(1,$oVersion->objectMakeUrl());
|
||||
}
|
||||
|
||||
apidb_footer();
|
||||
|
||||
@@ -18,7 +18,8 @@ if(!empty($aClean['sSubmit']))
|
||||
process_app_version_changes(true);
|
||||
downloadurl::processForm($aClean);
|
||||
url::processForm($aClean);
|
||||
util_redirect_and_exit(apidb_fullurl("appview.php?iVersionId=".$aClean['iVersionId']));
|
||||
$oVersion = new version($aClean['iVersionId']);
|
||||
util_redirect_and_exit($oVersion->objectMakeUrl());
|
||||
} else /* or display the webform for making changes */
|
||||
{
|
||||
|
||||
@@ -59,7 +60,7 @@ if(!empty($aClean['sSubmit']))
|
||||
echo html_frame_end();
|
||||
}
|
||||
|
||||
echo html_back_link(1,BASE."appview.php?iVersionId=".$oVersion->iVersionId);
|
||||
echo html_back_link(1,$oVersion->objectMakeUrl());
|
||||
apidb_footer();
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -18,9 +18,10 @@ if(!empty($aClean['sAction']))
|
||||
$oVersion = new Version($aClean['iVersionId']);
|
||||
$oVersion->iAppId = $aClean['iAppId'];
|
||||
$oVersion->update();
|
||||
$oApp = new application($aClean['iAppId']);
|
||||
|
||||
/* redirect to the application we just moved this version to */
|
||||
util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$aClean['iAppId']));
|
||||
util_redirect_and_exit($oApp->objectMakeUrl());
|
||||
} else /* or display the webform for making changes */
|
||||
{
|
||||
?>
|
||||
@@ -50,12 +51,13 @@ if(!empty($aClean['sAction']))
|
||||
{
|
||||
/* if the version ids differ then we should start a row with a new application */
|
||||
/* and the version that matches with it */
|
||||
if($currentAppId != $oRow->appId)
|
||||
if($iCurrentAppId != $oRow->appId)
|
||||
{
|
||||
$currentAppId = $oRow->appId;
|
||||
$oApp = new application($oRow->appId);
|
||||
$iCurrentAppId = $oRow->appId;
|
||||
echo '<tr style="background: #CCDDFF; border: thin solid; font-weight:bold;"><td align="left" style="padding-left:20px;">';
|
||||
$url = BASE."appview.php?iAppId=".$oRow->appId;
|
||||
echo '<a href="'.$url.'">'.substr($oRow->appName, 0, 30).'</a></td><td> - '.$oRow->appId.'</td>';
|
||||
$sUrl = $oApp->objectMakeUrl();
|
||||
echo '<a href="'.$sUrl.'">'.substr($oRow->appName, 0, 30).'</a></td><td> - '.$oRow->appId.'</td>';
|
||||
echo "<td style='padding-left:20px;'><a href='moveAppVersion.php?sAction=move&iVersionId=$oVersion->iVersionId&iAppId=$oRow->appId'>Move here</a></td></tr>";
|
||||
echo '<tr style="border-left: thin solid; border-right:thin solid; background: #FAFBE2;"><td style="padding-left:40px;" colspan="3" align="left">'.$oRow->versionName.'</td></tr>';
|
||||
} else /* just add another version */
|
||||
@@ -68,7 +70,7 @@ if(!empty($aClean['sAction']))
|
||||
echo html_table_end();
|
||||
echo html_frame_end();
|
||||
echo "</form>";
|
||||
echo html_back_link(1, BASE."appview.php?iVersionId=".$oVersion->iVersionId);
|
||||
echo html_back_link(1, $oVersion->objectMakeUrl());
|
||||
apidb_footer();
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -83,19 +83,24 @@ class maintainer
|
||||
{
|
||||
$sStatusMessage = "<p>The maintainer was successfully added into the database</p>\n";
|
||||
|
||||
$oApp = new Application($this->iAppId);
|
||||
$oVersion = new Version($this->iVersionId);
|
||||
//Send Status Email
|
||||
$sEmail = $oUser->sEmail;
|
||||
if ($sEmail)
|
||||
{
|
||||
if($this->iVersionId)
|
||||
$sURL = APPDB_ROOT."appview.php?iVersionId=$this->iVersionId";
|
||||
else
|
||||
$sURL = APPDB_ROOT."appview.php?iAppId=$this->iAppId";
|
||||
{
|
||||
$oVersion = new Version($this->iVersionId);
|
||||
$sURL = $oVersion->objectMakeUrl();
|
||||
$sName = version::fullName($this->iVersionId);
|
||||
} else
|
||||
{
|
||||
$oApp = new Application($this->iAppId);
|
||||
$sURL = $oApp->objectMakeUrl();
|
||||
$sName = $oApp->sName;
|
||||
}
|
||||
|
||||
$sSubject = "Application Maintainer Request Report";
|
||||
$sMsg = "Your application to be the maintainer of ".$oApp->sName." ".$oVersion->sName." has been accepted.\n";
|
||||
$sMsg = "Your application to be the maintainer of $sName has been accepted.\n";
|
||||
$sMsg .= "$sURL\n";
|
||||
$sMsg .= "$this->sReplyText\n";
|
||||
$sMsg .= "We appreciate your help in making the Application Database better for all users.\n\n";
|
||||
|
||||
@@ -98,41 +98,35 @@ class Monitor {
|
||||
|
||||
function SendNotificationMail($sAction="add",$sMsg=null)
|
||||
{
|
||||
/* set $aAppName appropriately */
|
||||
/* Set variables depending on whether it is an application or version monitor */
|
||||
if(isset($this->iVersionId))
|
||||
$sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId);
|
||||
else
|
||||
{
|
||||
$oVersion = new version($this->iVersionId);
|
||||
$sAppName = version::fullName($this->iVersionId);
|
||||
$sUrl = $oVersion->objectMakeUrl();
|
||||
$sVersion = " version";
|
||||
} else
|
||||
{
|
||||
$oApp = new application($this->iAppId);
|
||||
$sAppName = Application::lookup_name($this->iAppId);
|
||||
$sUrl = $oApp->objectMakeUrl();
|
||||
}
|
||||
|
||||
switch($sAction)
|
||||
{
|
||||
case "add":
|
||||
if (isset($this->iVersionId))
|
||||
{
|
||||
$sSubject = "Monitor for ".$sAppName;
|
||||
$sSubject .= " added: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
addmsg("You will now receive an email whenever changes are made to this Application version.", "green");
|
||||
} else
|
||||
{
|
||||
$sSubject = "Monitor for ".$sAppName." added: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iAppId=".$this->iAppid."\n";
|
||||
addmsg("You will now receive an email whenever changes are made to this Application.", "green");
|
||||
}
|
||||
$sSubject = "Monitor for ".$sAppName;
|
||||
$sSubject .= " added: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= "$sUrl\n";
|
||||
addmsg("You will now receive an email whenever changes are made ".
|
||||
"to this application$sVersion.", "green");
|
||||
break;
|
||||
case "delete":
|
||||
if (isset($this->iVersionId))
|
||||
{
|
||||
$sSubject = "Monitor for ".$sAppName;
|
||||
$sSubject .= " removed: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
addmsg("You will no longer receive an email whenever changes are made to this Application version.", "green");
|
||||
} else
|
||||
{
|
||||
$sSubject = "Monitor for ".$sAppName." removed: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iAppId=".$this->iAppid."\n";
|
||||
addmsg("You will no longer receive an email whenever changes are made to this Application.", "green");
|
||||
}
|
||||
$sSubject = "Monitor for ".$sAppName;
|
||||
$sSubject .= " removed: ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= "$sUrl\n";
|
||||
addmsg("You will no longer receive an email whenever changes ".
|
||||
"are made to this application$sVersion.", "green");
|
||||
break;
|
||||
}
|
||||
$sEmail = User::get_notify_email_address_list(null, $this->iVersionId);
|
||||
|
||||
@@ -137,21 +137,25 @@ class Note {
|
||||
|
||||
function SendNotificationMail($sAction="add",$sMsg=null)
|
||||
{
|
||||
$sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId);
|
||||
$oVersion = new version($this->iVersionId);
|
||||
$sAppName = version::fullName($this->iVersionId);
|
||||
$sMsg = $oVersion->objectMakeUrl()."\n";
|
||||
switch($sAction)
|
||||
{
|
||||
case "add":
|
||||
$sSubject = "Note ".$this->sTitle." for ".$sAppName." added by ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Note $this->sTitle for $sAppName added by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
addmsg("The note was successfully added into the database.", "green");
|
||||
break;
|
||||
case "edit":
|
||||
$sSubject = "Note ".$this->sTitle." for ".$sAppName." has been modified by ".$_SESSION['current']->sRealname;
|
||||
$sSubject = "Note $this->sTitle for $sAppName has been modified by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
addmsg("Note modified.", "green");
|
||||
break;
|
||||
case "delete":
|
||||
$oSubmitter = new User($this->iSubmitterId);
|
||||
$sSubject = "Note ".$this->sTitle." for ".$sAppName." has been deleted by ".$_SESSION['current']->sRealname;
|
||||
$sSubject = "Note $this->sTitle for $sAppName has been deleted by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
$sMsg .= "This note was made on ".print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))." by ".$oSubmitter->sRealname."\n";
|
||||
$sMsg .= "\n";
|
||||
$sMsg .= "Subject: ".$this->sTitle."\n";
|
||||
|
||||
@@ -331,32 +331,37 @@ class Screenshot {
|
||||
|
||||
function mailMaintainers($bDeleted=false)
|
||||
{
|
||||
$sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId);
|
||||
$oVersion = new version($this->iVersionId);
|
||||
$sAppName = version::fullName($this->iVersionId);
|
||||
$sMsg = $oVersion->objectMakeUrl()."\n";
|
||||
if(!$bDeleted)
|
||||
{
|
||||
if(!$this->bQueued)
|
||||
{
|
||||
$sSubject = "Screenshot for ".$sAppName." added by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Screenshot for $sAppName added by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
if($this->iSubmitterId)
|
||||
{
|
||||
$oSubmitter = new User($this->iSubmitterId);
|
||||
$sMsg .= "This screenshot has been submitted by ".$oSubmitter->sRealname.".";
|
||||
$sMsg .= "This screenshot has been submitted by ".
|
||||
$oSubmitter->sRealname.".";
|
||||
$sMsg .= "\n";
|
||||
}
|
||||
addmsg("The screenshot was successfully added into the database.", "green");
|
||||
addmsg("The screenshot was successfully added into the database.",
|
||||
"green");
|
||||
} else // Screenshot queued.
|
||||
{
|
||||
$sSubject = "Screenshot for ".$sAppName." submitted by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Screenshot for $sAppName submitted by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
$sMsg .= "This screenshot has been queued.";
|
||||
$sMsg .= "\n";
|
||||
addmsg("The screenshot you submitted will be added to the database database after being reviewed.", "green");
|
||||
addmsg("The screenshot you submitted will be added to the ".
|
||||
"database after being reviewed.", "green");
|
||||
}
|
||||
} else // Screenshot deleted.
|
||||
{
|
||||
$sSubject = "Screenshot for ".$sAppName." deleted by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Screenshot for $sAppName deleted by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
addmsg("Screenshot deleted.", "green");
|
||||
}
|
||||
|
||||
|
||||
@@ -255,28 +255,35 @@ class testData{
|
||||
/* Get the full app/version name to display */
|
||||
$sName = version::fullName($this->iVersionId);
|
||||
|
||||
$oVersion = new version($this->iVersionId);
|
||||
|
||||
switch($sAction)
|
||||
{
|
||||
case "add":
|
||||
$sSubject = "Submitted testing data accepted";
|
||||
$sMsg = "The testing data you submitted for '$sName' has been accepted by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n";
|
||||
$sMsg = "The testing data you submitted for '$sName' has been ".
|
||||
"accepted by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
|
||||
$sMsg .= "Administrators Responce:\n";
|
||||
break;
|
||||
case "reject":
|
||||
$sSubject = "Submitted testing data rejected";
|
||||
$sMsg = "The testing data you submitted for '$sName' has been rejected by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= APPDB_ROOT."testResults.php?sSub=view&iTestingId=".$this->iTestingId."\n";
|
||||
$sMsg = "The testing data you submitted for '$sName' has ".
|
||||
"been rejected by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= APPDB_ROOT."testResults.php?sSub=view&iTestingId=".
|
||||
$this->iTestingId."\n";
|
||||
$sMsg .= "Reason given:\n";
|
||||
break;
|
||||
case "delete":
|
||||
$sSubject = "Submitted testing data deleted";
|
||||
$sMsg = "The testing data you submitted for '$sName' has been deleted by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg = "The testing data you submitted for '$sName' has ".
|
||||
"been deleted by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= "Reason given:\n";
|
||||
break;
|
||||
}
|
||||
$sMsg .= $aClean['sReplyText']."\n";
|
||||
$sMsg .= "We appreciate your help in making the Application Database better for all users.";
|
||||
$sMsg .= "We appreciate your help in making the Application ".
|
||||
"Database better for all users.";
|
||||
|
||||
mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg);
|
||||
}
|
||||
@@ -289,7 +296,7 @@ class testData{
|
||||
|
||||
$oVersion = new Version($this->iVersionId);
|
||||
$oApp = new Application($oVersion->iAppId);
|
||||
$sBacklink = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n";
|
||||
$sBacklink = $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
|
||||
|
||||
switch($sAction)
|
||||
{
|
||||
@@ -666,7 +673,7 @@ class testData{
|
||||
|
||||
for($i = 1; $oRow = mysql_fetch_object($hResult); $i++)
|
||||
$sReturn .= html_tr(array(
|
||||
"<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">$oRow->appName: $oRow->versionName</a>",
|
||||
version::fullNameLink($oRow->versionId),
|
||||
$oRow->testedRating,
|
||||
$oRow->testedRelease,
|
||||
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
|
||||
|
||||
@@ -213,13 +213,25 @@ class Url {
|
||||
|
||||
function SendNotificationMail($bDeleted=false)
|
||||
{
|
||||
$sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId);
|
||||
/* Set variables depending on whether the url is for an app or version */
|
||||
if($this->iVersionId)
|
||||
{
|
||||
$oVersion = new version($this->iVersionId);
|
||||
$sAppName = version::fullName($this->iVersionId);
|
||||
$sUrl = $oVersion->objectMakeUrl();
|
||||
} else
|
||||
{
|
||||
$oApp = new application($this->iAppId);
|
||||
$sAppName = $oApp->sName;
|
||||
$sUrl = $oApp->objectMakeUrl();
|
||||
}
|
||||
|
||||
if(!$bDeleted)
|
||||
{
|
||||
if(!$this->bQueued)
|
||||
{
|
||||
$sSubject = "Url for ".$sAppName." added by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Url for $sAppName added by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = "$sUrl\n";
|
||||
if($this->iSubmitterId)
|
||||
{
|
||||
$oSubmitter = new User($this->iSubmitterId);
|
||||
@@ -229,16 +241,18 @@ class Url {
|
||||
addmsg("The url was successfully added into the database.", "green");
|
||||
} else // Url queued.
|
||||
{
|
||||
$sSubject = "Url for ".$sAppName." submitted by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Url for $sAppName submitted by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
$sMsg = "$sUrl\n";
|
||||
$sMsg .= "This url has been queued.";
|
||||
$sMsg .= "\n";
|
||||
addmsg("The url you submitted will be added to the database database after being reviewed.", "green");
|
||||
addmsg("The url you submitted will be added to the database ".
|
||||
"database after being reviewed.", "green");
|
||||
}
|
||||
} else // Url deleted.
|
||||
{
|
||||
$sSubject = "Url for ".$sAppName." deleted by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sSubject = "Url for $sAppName deleted by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = "$sUrl\n";
|
||||
addmsg("Url deleted.", "green");
|
||||
}
|
||||
|
||||
@@ -425,8 +439,8 @@ class Url {
|
||||
$_SESSION['current']->sRealname;
|
||||
|
||||
$sMsg = $aValues["iVersionId"] ?
|
||||
APPDB_ROOT."appview.php?iVersionId=".$aValues['iVersionId'] :
|
||||
APPDB_ROOT."appview.php?iAppId=".$avalues["iAppid"];
|
||||
$oVersion->objectMakeUrl() :
|
||||
$oApp->objectMakeUrl();
|
||||
$sMsg .= "\n\n";
|
||||
$sMsg .= "The following changed were made\n\n";
|
||||
$sMsg .= "$sWhatChanged\n\n";
|
||||
|
||||
@@ -243,10 +243,9 @@ function outputTopXRow($oRow)
|
||||
$oVersion = new Version($oRow->versionId);
|
||||
$oApp = new Application($oVersion->iAppId);
|
||||
$img = Screenshot::get_random_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting
|
||||
html_tr_highlight_clickable('appview.php?iVersionId='.$oRow->versionId, "white", "#f0f6ff", "white");
|
||||
html_tr_highlight_clickable($oVersion->objectMakeUrl(), "white", "#f0f6ff", "white");
|
||||
echo '
|
||||
<td class="app_name">
|
||||
<a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td>
|
||||
<td class="app_name">'.version::fullNameLink($oVersion->iVersionId).'</td>
|
||||
<td>'.util_trim_description($oApp->sDescription).'</td>
|
||||
<td><center>'.$img.'</center></td>
|
||||
</tr>';
|
||||
@@ -506,6 +505,7 @@ function outputSearchTableForhResult($search_words, $hResult)
|
||||
$c = 0;
|
||||
while($oRow = mysql_fetch_object($hResult))
|
||||
{
|
||||
$oApp = new application($oRow->appId);
|
||||
//skip if a NONAME
|
||||
if ($oRow->appName == "NONAME") { continue; }
|
||||
|
||||
@@ -519,7 +519,7 @@ function outputSearchTableForhResult($search_words, $hResult)
|
||||
|
||||
//display row
|
||||
echo "<tr class=$bgcolor>\n";
|
||||
echo " <td>".html_ahref($oRow->appName,BASE."appview.php?iAppId=$oRow->appId")."</td>\n";
|
||||
echo " <td>".html_ahref($oRow->appName,$oApp->objectMakeUrl())."</td>\n";
|
||||
echo " <td>".util_trim_description($oRow->description)."</td>\n";
|
||||
echo " <td>$y->versions </td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
@@ -500,7 +500,7 @@ class Version {
|
||||
if($this->sQueued == "false")
|
||||
{
|
||||
$sSubject = "Version ".$this->sName." of ".$oApp->sName." added by ".$_SESSION['current']->sRealname;
|
||||
$sMsg = APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sMsg = $this->objectMakeUrl()."\n";
|
||||
if($this->iSubmitterId)
|
||||
{
|
||||
$oSubmitter = new User($this->iSubmitterId);
|
||||
@@ -524,7 +524,7 @@ class Version {
|
||||
break;
|
||||
case "edit":
|
||||
$sSubject = "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."\n";
|
||||
$sMsg .= $this->objectMakeUrl()."\n";
|
||||
addmsg("Version modified.", "green");
|
||||
break;
|
||||
case "delete":
|
||||
@@ -812,7 +812,8 @@ class Version {
|
||||
$oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId);
|
||||
if(!$oMonitor->iMonitorId)
|
||||
{
|
||||
echo '<form method=post name=sMessage action=appview.php?iVersionId='.$this->iVersionId.'&iAppId='.$oApp->iAppId.'>';
|
||||
echo '<form method="post" name="sMessage" action='.
|
||||
$this->objectMakeUrl().'&iAppId='.$oApp->iAppId.'>';
|
||||
echo '<input type=hidden name="sSub" value="StartMonitoring" />';
|
||||
echo '<input type=submit value="Monitor Changes" class="button" />';
|
||||
echo "</form>";
|
||||
@@ -862,7 +863,8 @@ class Version {
|
||||
{
|
||||
echo '<tr><td colspan="2" align="center">';
|
||||
echo '</form>';
|
||||
echo '<form method=post name=sMessage action=appview.php?iVersionId='.$this->iVersionId.'>';
|
||||
echo '<form method="post" name="sMessage" action='.
|
||||
$this->objectMakeUrl().'>';
|
||||
echo '<input type=hidden name="sSub" value="StopMonitoring" />';
|
||||
echo '<input type=submit value="Stop Monitoring Version" class="button" />';
|
||||
echo '</form>';
|
||||
@@ -1091,7 +1093,7 @@ class Version {
|
||||
|
||||
for($i = 1; $oRow = mysql_fetch_object($hResult); $i++)
|
||||
$sResult .= html_tr(array(
|
||||
"<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">$oRow->appName: $oRow->versionName</a>",
|
||||
version::fullNameLink($oRow->versionId),
|
||||
$oRow->description,
|
||||
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
|
||||
($i % 2) ? "color0" : "color1");
|
||||
@@ -1145,7 +1147,7 @@ class Version {
|
||||
|
||||
function objectMakeUrl()
|
||||
{
|
||||
return BASE."appview.php?iVersionId=$this->iVersionId";
|
||||
return APPDB_ROOT."appview.php?iVersionId=$this->iVersionId";
|
||||
}
|
||||
|
||||
function objectMakeLink()
|
||||
|
||||
@@ -148,17 +148,18 @@ function vote_update($vars)
|
||||
if(!$_SESSION['current']->isLoggedIn())
|
||||
util_show_error_page_and_exit("You must be logged in to vote");
|
||||
|
||||
$oVersion = new version($vars['iVersionId']);
|
||||
|
||||
if( !is_numeric($vars['iVersionId']) OR !is_numeric($vars['iSlot']))
|
||||
{
|
||||
if(is_numeric($vars['iVersionId']))
|
||||
util_redirect_and_exit(apidb_fullurl(
|
||||
"appview.php?iVersionId=".$vars['iVersionId']));
|
||||
util_redirect_and_exit($oVersion->objectMakeUrl());
|
||||
else
|
||||
util_redirect_and_exit(apidb_fullurl("index.php"));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if($vars["sVote"])
|
||||
{
|
||||
addmsg("Registered vote for App #".$vars['iVersionId'], "green");
|
||||
@@ -174,8 +175,7 @@ function vote_update($vars)
|
||||
}
|
||||
}
|
||||
|
||||
util_redirect_and_exit(apidb_fullurl(
|
||||
"appview.php?iVersionId=".$vars['iVersionId']));
|
||||
util_redirect_and_exit($oVersion->objectMakeUrl());
|
||||
}
|
||||
|
||||
// tell us if there is a vote in a given slot so we don't
|
||||
|
||||
@@ -88,8 +88,7 @@ if ($aClean['sSub'])
|
||||
}
|
||||
if ($aClean['sSub'] == 'view')
|
||||
{
|
||||
$oApp = new Application($oVersion->iAppId);
|
||||
$sVersionInfo = $oApp->sName." ".$oVersion->sName;
|
||||
$sVersionInfo = version::fullName($oVersion->iVersionId);
|
||||
|
||||
switch($oTest->sQueued)
|
||||
{
|
||||
@@ -127,7 +126,7 @@ if ($aClean['sSub'])
|
||||
// View Test Details
|
||||
$oTest->outputEditor($aClean['sDistribution'],true);
|
||||
|
||||
echo '<a href="'.BASE."appview.php?iVersionId=".$oTest->iVersionId.'">Back to Version</a>';
|
||||
echo '<a href="'.$oVersion->objectMakeUrl().'">Back to Version</a>';
|
||||
|
||||
echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";
|
||||
|
||||
|
||||
@@ -72,14 +72,10 @@ while ($oRow = mysql_fetch_object($Ids))
|
||||
echo $img;
|
||||
echo "<div align=center>". substr($oRow->description,0,20). "\n";
|
||||
|
||||
echo "<br />[<a href='".apidb_fullurl("appview.php");
|
||||
echo "?iAppId=".$oApp->iAppId."'>";
|
||||
echo $oApp->sName."</a>]";
|
||||
echo "<br />[".$oApp->objectMakeLink()."]";
|
||||
|
||||
echo "<br />[".$oVersion->objectMakeLink()."]";
|
||||
|
||||
echo "<br />[<a href='".apidb_fullurl("appview.php");
|
||||
echo "?iVersionId=".$oVersion->iVersionId."'>";
|
||||
echo "Version: ".$oVersion->sName."</a>]";
|
||||
|
||||
echo "</div></td>\n";
|
||||
// end row if counter of 3
|
||||
if ($c % 3 == 0) echo "</tr><tr>\n";
|
||||
|
||||
@@ -44,6 +44,8 @@ if(!is_numeric($aClean['iBugId']))
|
||||
{
|
||||
while($oRow = mysql_fetch_object($hResult))
|
||||
{
|
||||
$oApp = new application($oRow->appId);
|
||||
$oVersion = new version($oRow->versionId);
|
||||
$sDownloadUrls = "";
|
||||
if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl"))
|
||||
{
|
||||
@@ -56,11 +58,11 @@ if(!is_numeric($aClean['iBugId']))
|
||||
$bgcolor = ($c % 2 == 0) ? "color0" : "color1";
|
||||
echo '<tr class='.$bgcolor.'>',"\n";
|
||||
echo ' <td>',"\n";
|
||||
echo ' <a href="appview.php?iAppId='.$oRow->appId.'">'.$oRow->appName.'</a>',"\n";
|
||||
echo " ".$oApp->objectMakeLink()."\n";
|
||||
echo ' </td>',"\n";
|
||||
echo ' <td>'.$oRow->appDescription.'</td>',"\n";
|
||||
echo ' <td>',"\n";
|
||||
echo ' <a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oRow->versionName.'</a>',"\n";
|
||||
echo " ".$oVersion->objectMakeLink()."\n";
|
||||
echo ' </td>',"\n";
|
||||
echo " <td>$sDownloadUrls</td>\n";
|
||||
echo '</tr>',"\n";
|
||||
|
||||
Reference in New Issue
Block a user