mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-04 05:32:56 +00:00
Fixes for bugs 332843, 337189, 336598, 333355. Thanks to trev, Ryan for writing patches for XSL and rewrites.
This commit is contained in:
mike.morgan%oregonstate.edu
parent
7a34047c44
commit
4e09a23e98
webtools/addons/public
@ -16,29 +16,43 @@ RewriteBase /YOURPATH/public/htdocs
|
||||
|
||||
# Rewrites to be compatible with older versions of addons.
|
||||
RewriteRule ^update/VersionCheck.php(.*)$ update.php$1
|
||||
RewriteRule ^extensions/moreinfo.php(.*)$ addon.php$1
|
||||
RewriteRule ^themes/moreinfo.php(.*)$ addon.php$1
|
||||
RewriteRule ^rss/index.php(.*)$ rss.php$1
|
||||
|
||||
# Compatiblity for v1 of extensions. The hardcoded URL's in the old
|
||||
# Compatibility for v1 extension and theme links.
|
||||
# Old example URLs:
|
||||
# /extensions/moreinfo.php?application=thunderbird&id=123
|
||||
# /extensions/moreinfo.php?id=123
|
||||
# /themes/moreinfo.php?id=321&application=seamonkey
|
||||
# /themes/moreinfo.php?id=321
|
||||
# New:
|
||||
# /thunderbird/123/
|
||||
# /firefox/123/
|
||||
# /seamonkey/321/
|
||||
# /firefox/321/
|
||||
RewriteCond %{QUERY_STRING} application=(\w+)&.*id=([0-9]+)
|
||||
RewriteRule ^(extensions|themes)/moreinfo.php$ %1/%2/? [R=301,L]
|
||||
RewriteCond %{QUERY_STRING} id=([0-9]+)&.*application=(\w+)
|
||||
RewriteRule ^(extensions|themes)/moreinfo.php$ %2/%1/? [R=301,L]
|
||||
RewriteCond %{QUERY_STRING} id=([0-9]+)
|
||||
RewriteRule ^(extensions|themes)/moreinfo.php$ firefox/%1/? [R=301,L]
|
||||
|
||||
# Compatibility for v1 of extensions. The hardcoded URL's in the old
|
||||
# browsers need this to get to the right pages: (the strings are the GUIDs)
|
||||
# Old example URL:
|
||||
# /extensions/?application={3550f703-e582-4d05-9a08-453d09bdfdc6}
|
||||
# New:
|
||||
# /extensions.php?app={3550f703-e582-4d05-9a08-453d09bdfdc6}
|
||||
RewriteCond %{REQUEST_URI} /extensions/
|
||||
RewriteCond %{QUERY_STRING} ^application=(.*)$
|
||||
RewriteRule ^.*$ extensions.php?app=%1 [L]
|
||||
RewriteRule ^extensions/$ extensions.php?app=%1 [R=301,L]
|
||||
|
||||
# Compatiblity for v1 of extensions. The hardcoded URL's in the old
|
||||
# Compatibility for v1 of extensions. The hardcoded URL's in the old
|
||||
# browsers need this to get to the right pages: (the strings are the GUIDs)
|
||||
# Old example URL:
|
||||
# /themes/?application={3550f703-e582-4d05-9a08-453d09bdfdc6}
|
||||
# New:
|
||||
# /themes.php?app={3550f703-e582-4d05-9a08-453d09bdfdc6}
|
||||
RewriteCond %{REQUEST_URI} /themes/
|
||||
RewriteCond %{QUERY_STRING} ^application=(.*)$
|
||||
RewriteRule ^.*$ themes.php?app=%1 [L]
|
||||
RewriteRule ^themes/$ themes.php?app=%1 [R=301,L]
|
||||
|
||||
# Send rss/* to rss.php.
|
||||
# Example:
|
||||
|
||||
114
webtools/addons/public/htdocs/css/rss.xsl
Normal file
114
webtools/addons/public/htdocs/css/rss.xsl
Normal file
@ -0,0 +1,114 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
|
||||
<xsl:template match="/rss">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title><xsl:value-of select="channel/title"/></title>
|
||||
<meta name="keywords" content="mozilla update, mozilla extensions, mozilla plugins, thunderbird themes, thunderbird extensions, firefox extensions, firefox themes" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/print.css" media="print" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/base/content.css" media="all" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/cavendish/content.css" title="Cavendish" media="all" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/base/template.css" media="screen" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/cavendish/template.css" title="Cavendish" media="screen" />
|
||||
<link rel="stylesheet" type="text/css" href="/css/forms.css" media="screen" />
|
||||
<link rel="home" title="Home" href="https://addons.mozilla.org/" />
|
||||
<link rel="alternate" type="application/rss+xml" href="{self}" title="{title}" />
|
||||
<link rel="shortcut icon" href="{channel/image/url}" />
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="container">
|
||||
<p class="skipLink"><a href="#firefox-feature" accesskey="2">Skip to main content</a></p>
|
||||
<div id="mozilla-com"><a href="http://www.mozilla.com/">Visit Mozilla.com</a></div>
|
||||
<div id="header">
|
||||
<div id="key-title">
|
||||
<h1>
|
||||
<a href="/firefox/" title="Return to home page" accesskey="1">
|
||||
<img src="/images/title-firefox.gif" width="276" height="54" alt="Firefox Add-ons Beta" />
|
||||
</a>
|
||||
</h1>
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
addUsernameToHeader();
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
<form id="search" method="get" action="/search.php" title="Search Mozilla Update">
|
||||
<div>
|
||||
<label for="q" title="Search Mozilla Update">search:</label>
|
||||
<input type="text" id="q" name="q" accesskey="s" size="10" />
|
||||
<input type="hidden" name="app" value="firefox" />
|
||||
<input type="submit" id="submit" value="Go" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="key-menu">
|
||||
<ul id="menu-firefox">
|
||||
<li><a href="/firefox/">Home</a></li>
|
||||
<li><a href="/firefox/extensions/">Extensions</a></li>
|
||||
<li><a href="/firefox/plugins/">Plugins</a></li>
|
||||
<li><a href="/firefox/search-engines/">Search Engines</a></li>
|
||||
<li><a href="/firefox/themes/">Themes</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- end key-menu -->
|
||||
</div>
|
||||
<!-- end header -->
|
||||
<hr class="hide" />
|
||||
<div id="mBody">
|
||||
<h1><xsl:value-of select="channel/title"/></h1>
|
||||
<p>
|
||||
This is an RSS feed designed to be read by an RSS reader. Which you aren't.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>What's an RSS Feed?</strong><br />
|
||||
<acronym title="Really Simple Syndication">RSS</acronym> feeds
|
||||
allow you to take the latest content from our site and view it in other places
|
||||
such as a feed reader, your browser or your website. Feeds make it easy and
|
||||
convenient to stay on top of the latest from Mozilla Addons.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>How do I use this feed?</strong><br/>
|
||||
To add this feed as a live bookmark in Firefox, simply click on the orange icon
|
||||
(<img src="/images/rss.png" alt="RSS" />) in the address bar. Otherwise, take the
|
||||
URL of this feed and add it to your favorite RSS reader.
|
||||
</p>
|
||||
|
||||
<p>Preview of this feed:</p>
|
||||
<ul>
|
||||
<xsl:for-each select="channel/item">
|
||||
<li>
|
||||
<strong><a href="{link}"><xsl:value-of select="title"/></a></strong>
|
||||
</li>
|
||||
</xsl:for-each>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<hr class="hide" />
|
||||
|
||||
<div id="footer">
|
||||
|
||||
<p><a href="/firefox/" class="switch-fx">Firefox Add-ons </a><a href="/thunderbird/" class="switch-tb">Thunderbird Add-ons </a><a href="/mozilla/" class="switch-suite">Mozilla Suite Add-ons </a></p>
|
||||
<p><a href="/faq.php">FAQ</a> <a href="/feeds.php">Feeds/RSS</a> <a href="/login.php">Log In</a> <a href="/logout.php">Logout</a> <a href="/createaccount.php">Register</a></p>
|
||||
<p><a href="http://www.mozilla.org/privacy-policy.html">Privacy Policy</a> <a href="http://www.mozilla.org/foundation/donate.html">Donate to Mozilla</a> <a href="http://mozilla.org/">The Mozilla Organization</a></p>
|
||||
|
||||
<p><span>Copyright © 2004-2006</span> <a href="http://www.xramp.com/">256-bit SSL Encryption provided by XRamp</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- close container -->
|
||||
|
||||
<div class="disclaimer">
|
||||
Mozilla is providing links to these applications as a courtesy, and makes no representations
|
||||
regarding the applications or any information related thereto. Any questions, complaints or
|
||||
claims regarding the applications must be directed to the appropriate software vendor. See
|
||||
our <a href="/support.php">Support Page</a> for support information and contacts.
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
@ -249,8 +249,8 @@ if ($resultCount<$page['right']) {
|
||||
|
||||
|
||||
// If we have only one result, redirect to the addon page.
|
||||
if ( count($rawResults) == 1) {
|
||||
header('Location: https://'.$_SERVER['HTTP_HOST'].WEB_PATH.'/addon.php?id='.$rawResults[0]);
|
||||
if ( $resultCount == 1) {
|
||||
header('Location: https://'.$_SERVER['HTTP_HOST'].WEB_PATH.'/'.$clean['app'].'/'.$rawResults[0].'/');
|
||||
exit;
|
||||
} else {
|
||||
foreach($rawResults as $id) {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
* clients don't use anyway. For testing, if you would like to debug, supply
|
||||
* the script with ?debug=true
|
||||
*
|
||||
* @package umo
|
||||
* @package amo
|
||||
* @subpackage pub
|
||||
*/
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ released on {$addon->VersionDateAdded|date_format}
|
||||
{if $c_added_comment}
|
||||
<p>Your comment has been added successfully.</p>
|
||||
<ul>
|
||||
<li><a href="addon.php?id={$addon->ID}">Return to {$addon->Name|escape}</a></li>
|
||||
<li><a href="{$config.webpath}/{$app}/{$addon->ID}/">Return to {$addon->Name|escape}</a></li>
|
||||
</ul>
|
||||
{else}
|
||||
<form id="commentform" class="amo-form" name="commentform" method="post" action="">
|
||||
|
||||
@ -17,4 +17,4 @@ released on {$addon->VersionDateAdded|date_format}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<p>« <a href="./addon.php?id={$addon->ID}">Return to information about {$addon->Name}</a></p>
|
||||
<p>« <a href="{$config.webpath}/{$app}/{$addon->ID}/">Return to information about {$addon->Name}</a></p>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml-stylesheet type="text/xsl" href="{$config.webpath|escape:html:"UTF-8"}/css/cavendish/rss.xsl" media="screen"?>
|
||||
<?xml-stylesheet type="text/xsl" href="{$config.webpath|escape:html:"UTF-8"}/css/rss.xsl" media="screen"?>
|
||||
<rss version="2.0">
|
||||
<channel>
|
||||
<title>{$list|escape:html:"UTF-8"} Mozilla Addons</title>
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
<ul>
|
||||
<li><img src="{$config.webpath}/search-engines-static/rollyo.jpg" alt=""/> <a href="http://www.rollyo.com/firefox_search.html"><strong>Rollyo: Roll Your Own Firefox Search Engine!</strong><br/>Create a personal search engine that provides relevant results from a hand selected list of sites.</a></li>
|
||||
<li><a href="http://mycroft.mozdev.org/">Browse through more search engines at mycroft.mozdev.org.</a></li>
|
||||
<li><a href="{$config.webpath}/extensions/moreinfo.php?id=1563">Use the SearchPluginHacks extension to remove a Search Engine.</a></li>
|
||||
<li><a href="{$config.webpath}/extensions/moreinfo.php?id=1563">Remove a Search Engine with the SearchPluginHacks extension.</a></li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user