Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 293727

Browse Source 
backing out temp changes to mitigate firefox vulnerability
    reverting should be secure based on the top-level rewrites done to divert non-secure versions


git-svn-id: svn://10.0.0.236/branches/MOZILLA_UPDATE_1_0_BRANCH@173328 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mike.morgan%oregonstate.edu
2005-05-12 17:17:39 +00:00
parent 9a048281b1
commit 4942dabbae
7 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/webtools/update/core/inc_global.php
View File

@@ -165,16 +165,14 @@ function uriparams() {
// function installtrigger() -- print installtrigger function for extension/theme installation on page.
// Usage null uriparams(string functionname)
// -----------------------------
$rndNum = md5(rand(1, 1048576));
function installtrigger($functionname) {
global $rndNum;
if ($functionname=="extensions") {
echo'
<script type="text/javascript">
<!--
function install'.$rndNum.'( aEvent, extName, iconURL) {
function install( aEvent, extName, iconURL) {
var p = new XMLHttpRequest();
p.open("GET", "'.WEB_PATH.'/core/install.php?uri="+aEvent.target.href, false);
p.send(null);
@@ -198,7 +196,7 @@ function installtrigger($functionname) {
echo'
<script type="text/javascript">
<!--
function installTheme'.$rndNum.'( aEvent, extName) {
function installTheme( aEvent, extName) {
var p = new XMLHttpRequest();
p.open("GET", "'.WEB_PATH.'/core/install.php?uri="+aEvent.target.href, false);
p.send(null);

7
mozilla/webtools/update/core/inc_header.php
View File

@@ -121,11 +121,4 @@ if (!empty($page_headers)) {
<!-- closes #header-->
<hr class="hide">
<br>
<table style="border: solid red 4px;"><tr>
<td style="border: solid black 1px; font-size: 1.1em; font-weight: bold; padding: 10px 15px 10px 15px;">
<p>To address security concerns, we have made a number of changes, including temporarily changing the URL for this site. If prompted, please <b>DO NOT</b> add this new URL
(do-not-add.mozilla.org) to your Allowed Sites or White List.</p>
<p><a href="http://wiki.mozilla.org/Installing_Extensions">Instructions for Manually Installing Extensions and Themes</a></p>
</td></tr></table>

2
mozilla/webtools/update/developers/approval.php
View File

@@ -175,7 +175,7 @@ WHERE `approved` = '?' GROUP BY TV.URI ORDER BY TV.DateUpdated ASC";
echo " <span>(<a href=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'".addslashes($row['URI'])."','".addslashes($row['Name']." ".$row['Version'])."'))\">Install Now</a>)</span>\n";
} else {
// Show extensions install link.
echo " <span>(<a href=\"javascript:alert('Temporarily Disabled');\">Install Now</a>)</span>";
echo " <span>(<a href=\"javascript:void(InstallTrigger.install({'".addslashes($row['Name'].$row['Version'])."':'".addslashes($row['URI'])."'}))\">Install Now</a>)</span>";
}
// Show a download now link.

8
mozilla/webtools/update/extensions/moreinfo.php
View File

@@ -362,9 +362,9 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des
if ($appname=="Thunderbird") {
$downloadURL=mozupd_buildDownloadURL($uri,$name,$version);
echo "<a href=\"$downloadURL\" title=\"Right-Click to Download $name $version\">";
echo "<a href=\"$downloadURL\" onclick=\"return install(event,'".addslashes($name)." $version for Thunderbird', '../images/default.png');\" title=\"Right-Click to Download $name $version\">";
} else {
echo"<b><a href=\"$uri\" TITLE=\"Install $name $version (Right-Click to Download)\">";
echo"<b><a href=\"$uri\" onclick=\"return install(event,'".addslashes($name)." $version', '../images/default.png');\" TITLE=\"Install $name $version (Right-Click to Download)\">";
}
?>Install Now</a></b> (<?php echo"$filesize"; ?>&nbsp;KB&nbsp;File)</div></div>
@@ -551,9 +551,9 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des
echo"<DIV class=\"iconbar\">";
if ($appname=="Thunderbird") {
$downloadURL=mozupd_buildDownloadURL($uri,$name,$version);
echo "<a href=\"$downloadURL\">";
echo "<a href=\"$downloadURL\" onclick=\"return install(event,'".addslashes($name)." $version for Thunderbird', '../images/default.png');\">";
} else {
echo"<a href=\"$uri\">";
echo"<a href=\"$uri\" onclick=\"return install(event,'".addslashes($name)." $version', '../images/default.png');\">";
}
echo"<IMG SRC=\"../images/download.png\" HEIGHT=34 WIDTH=34 TITLE=\"Install $name (Right-Click to Download)\" ALT=\"\">Install</A><BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
echo"<DIV class=\"iconbar\"><IMG SRC=\"../images/".strtolower($appname)."_icon.png\" HEIGHT=34 WIDTH=34 ALT=\"\">&nbsp;For $appname:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";

3
mozilla/webtools/update/extensions/showlist.php
View File

@@ -443,7 +443,8 @@ echo"<DIV class=\"iconbar\">";
if ($appname=="Thunderbird") {
echo"<A HREF=\"moreinfo.php?".uriparams()."&amp;id=$id\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"More Info about $name\" ALT=\"\">More Info</A>";
} else {
echo"<a href=\"$uri\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"Install $name\" ALT=\"\">Install</A>";
echo"<a href=\"$uri\" onclick=\"return install(event,'".addslashes($name.' '.$version)."',
'../images/default.png');\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"Install $name\" ALT=\"\">Install</A>";
}
echo"<BR><SPAN class=\"filesize\">&nbsp;&nbsp;$filesize kb</SPAN></DIV>";
echo"<DIV class=\"iconbar\"><IMG SRC=\"../images/".strtolower($appname)."_icon.png\" HEIGHT=34 WIDTH=34 ALT=\"\">&nbsp;For $appname:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";

2
mozilla/webtools/update/themes/moreinfo.php
View File

@@ -378,7 +378,7 @@ if (isset($_GET["vid"])) {
$downloadURL=mozupd_buildDownloadURL($uri,$name,$version);
echo"<a href=\"$downloadURL\" onclick=\"return installTheme(event,'".addslashes($name)." $version for Thunderbird');\" title=\"Right-Click to Download $name $version\">";
} else {
echo"<b><a href=\"$uri\" TITLE=\"Install $name $version (Right-Click to Download)\">";
echo"<b><a href=\"$uri\" onclick=\"return installTheme(event,'".addslashes($name)." $version');\" TITLE=\"Install $name $version (Right-Click to Download)\">";
}
?>Install Now</a></b>&nbsp;(<?php echo"$filesize"; ?>&nbsp;KB&nbsp;File)</div></div>

3
mozilla/webtools/update/themes/showlist.php
View File

@@ -445,7 +445,8 @@ echo"<DIV class=\"iconbar\">";
if ($appname=="Thunderbird") {
echo"<A HREF=\"moreinfo.php?".uriparams()."&amp;id=$id\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"More Info about $name\" ALT=\"\">More Info</A>";
} else {
echo"<a href=\"$uri\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"Install $name\" ALT=\"\">Install</A>";
echo"<a href=\"$uri\" onclick=\"return install(event,'".addslashes($name.' '.$version)."',
'../images/default.png');\"><IMG SRC=\"../images/download.png\" HEIGHT=32 WIDTH=32 TITLE=\"Install $name\" ALT=\"\">Install</A>";
}
echo"<BR><SPAN class=\"filesize\">&nbsp;&nbsp;$filesize kb</SPAN></DIV>";
echo"<DIV class=\"iconbar\"><IMG SRC=\"../images/".strtolower($appname)."_icon.png\" HEIGHT=34 WIDTH=34 ALT=\"\">&nbsp;For $appname:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";