joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-29 16:43:42 +00:00
Code Packages Releases Activity

Fixed [#6442] Bug in SEF + mosRedirect

Browse Source 
Router now creates absolute paths instead of relatives ones.
Added baseurl variable to JView and JDocumentHTML

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@8969 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Johan Janssens 2007-09-20 23:30:26 +00:00
parent 970e35a61b
commit 32e54abfa3
31 changed files with 164 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.php
View File

@ -37,6 +37,14 @@ Legend:
- -> Removed
! -> Note
20-Sep-2007 Johan Janssens
# Fixed [#6442] Bug in SEF + mosRedirect
^ Router now creates absolute paths instead of relatives ones.
+ Added baseurl variable to JView and JDocumentHTML
! These changes have been made to improve compilance with W3C standards especially compilance with for
the base href implementation. Template designers should take notice any relative paths used in their
1.5 templates will need to be changed to absolute paths to allow the template to work with SEF on.
19-Sep-2007 Toby Patterson
! Shiver me Timbers if 'ay waz'n an sea lov'n greet'n
# Fixed [#6871] impossible to uninstall component when database tables or folders missing ( issue 1 )

3
administrator/components/com_config/controllers/application.php
View File

@ -177,6 +177,7 @@ class ConfigControllerApplication extends ConfigController
// SEO SETTINGS
$lists['sef'] = JHTML::_('select.booleanlist', 'sef', 'class="inputbox"', $row->sef);
$lists['sef_rewrite'] = JHTML::_('select.booleanlist', 'sef_rewrite', 'class="inputbox"', $row->sef_rewrite);
$lists['sef_suffix'] = JHTML::_('select.booleanlist', 'sef_suffix', 'class="inputbox"', $row->sef_suffix);
// FEED SETTINGS
$formats = array (JHTML::_('select.option', 'RSS2.0', JText::_('RSS')), JHTML::_('select.option', 'Atom', JText::_('Atom')));
@ -260,7 +261,7 @@ class ConfigControllerApplication extends ConfigController
// SEO SETTINGS
$config_array['sef'] = JRequest::getVar('sef', 0, 'post', 'int');
$config_array['sef_rewrite'] = JRequest::getVar('sef_rewrite', 0, 'post', 'int');
$config_array['sef_suffix'] = JRequest::getVar('sef_suffix', 0, 'post', 'string');
$config_array['sef_suffix'] = JRequest::getVar('sef_suffix', 0, 'post', 'int');
// FEED SETTINGS
$config_array['feed_limit'] = JRequest::getVar('feed_limit', 10, 'post', 'int');

4
administrator/components/com_config/views/application/tmpl/config_seo.php
View File

@ -29,11 +29,11 @@
<tr>
<td width="185" class="key">
<span class="editlinktip hasTip" title="<?php echo JText::_( 'URL Suffix' ); ?>::<?php echo JText::_('TIPURLSUFFIX'); ?>">
<?php echo JText::_( 'URL Suffix' ); ?>
<?php echo JText::_( 'Add suffix to URLs' ); ?>
</span>
</td>
<td>
<input class="text_area" type="text" size="20" name="sef_suffix" value="<?php echo $row->sef_suffix; ?>" />
<?php echo $lists['sef_suffix']; ?>
</td>
</tr>
</tbody>

4
administrator/language/en-GB/en-GB.com_config.ini
View File

@ -4,6 +4,7 @@
# License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
# Note : All ini files need to be saved as UTF-8 - No BOM
ADD SUFFIX TO URLS=Add suffix to URLs
ALLOW USER REGISTRATION=Allow User Registration
ATOM=Atom
AUTHOR NAMES=Author Names
@ -179,9 +180,8 @@ TIPSMTPHOST=Enter the name of the SMTP host.
TIPSMTPUSER=Enter the username for access to the SMTP host
TIPSMTPPASS=Enter the password for access to the SMTP host
TIPTMPFOLDER=Please select a writable Temp folder.
TIPURLSUFFIX=Suffix to use for rewritten URLs. '.html' is often used.
TIPURLSUFFIX=If yes, the system will add a suffix to the url based on the document type.
TIPUSEMODREWRITE=Select whether to use the Apache Rewrite Module to catch URLs that meet specific conditions, and rewrite them as directed.
URL SUFFIX=URL Suffix
USE MOD_REWRITE=Use Apache <em>mod_rewrite</em>
USER SETTINGS=User Settings
USERS=Users

13
includes/application.php
View File

@ -105,13 +105,13 @@ class JSite extends JApplication
}
if($router->getMode() == JROUTER_MODE_SEF) {
$document->setBase(JURI::base());
$document->setBase(JURI::current());
}
} break;
case 'feed':
{
$document->setBase(JURI::base());
$document->setBase(JURI::current());
} break;
default: break;
@ -352,15 +352,6 @@ class JSite extends JApplication
function &getRouter()
{
$options['mode'] = $this->getCfg('sef');
if($options['mode'] && $this->getCfg('sef_suffix')) {
$options['suffix'] = $this->getCfg('sef_suffix');
}
if($options['mode'] && !$this->getCfg('sef_rewrite')) {
$options['prefix'] = 'index.php';
}
$router =& parent::getRouter('site', $options);
return $router;
}

79
includes/router.php
View File

@ -181,8 +181,6 @@ class JRouterSite extends JRouter
function _buildRawRoute(&$uri)
{
$route = 'index.php'; //the route created
if($uri->getVar('Itemid') && count($uri->getQuery(true)) == 2)
{
$menu =& JSite::getMenu();
@ -194,36 +192,37 @@ class JRouterSite extends JRouter
$uri->setQuery($item->query);
$uri->setVar('Itemid', $itemid);
}
return $route;
}
function _buildSefRoute(&$uri)
{
$route = ''; //the route created
// Get the route
$route = $uri->getPath();
//Get the query data
$query = $uri->getQuery(true);
if(!isset($query['option'])) {
return $route;
return;
}
$menu =& JSite::getMenu();
/*
* Built the application route
*/
$route = 'component/'.substr($query['option'], 4);
$tmp = 'component/'.substr($query['option'], 4);
if(isset($query['Itemid']))
{
$item = $menu->getItem($query['Itemid']);
if ($query['option'] == $item->component) {
$route = $item->route;
$tmp = $item->route;
}
}
$route .= '/'.$tmp;
/*
* Built the component route
@ -255,18 +254,34 @@ class JRouterSite extends JRouter
//Set query again in the URI
$uri->setQuery($query);
return $route;
$uri->setPath($route);
}
function _processParseRules(&$uri)
{
$app =& JFactory::getApplication();
$vars = array();
//Process rules
if($start = $uri->getVar('start')) {
$uri->delVar('start');
$vars['limitstart'] = $start;
if($this->_mode == JROUTER_MODE_SEF)
{
if($start = $uri->getVar('start'))
{
$uri->delVar('start');
$vars['limitstart'] = $start;
}
if($app->getCfg('sef_suffix'))
{
// Get the path
$path = $uri->getPath();
if($suffix = pathinfo($path, PATHINFO_EXTENSION))
{
$uri->setPath(str_replace('.'.$suffix, '', $path));
$vars['format'] = $suffix;
}
}
}
return $vars;
@ -274,16 +289,30 @@ class JRouterSite extends JRouter
function _processBuildRules(&$uri)
{
$route = '';
//Process rules
if ($limitstart = $uri->getVar('limitstart'))
$app =& JFactory::getApplication();
// Get the path data
$route = $uri->getPath();
if($this->_mode == JROUTER_MODE_SEF && $route)
{
$uri->setVar('start', (int) $limitstart);
$uri->delVar('limitstart');
if ($limitstart = $uri->getVar('limitstart'))
{
$uri->setVar('start', (int) $limitstart);
$uri->delVar('limitstart');
}
if($app->getCfg('sef_suffix'))
{
if($format = $uri->getVar('format', 'html'))
{
$route .= '.'.$format;
$uri->delVar('format');
}
}
}
return $route;
$uri->setPath($route);
}
function &_createURI($url)

1
installation/template/tmpl/configuration.html
View File

@ -61,6 +61,7 @@ var $MetaAuthor = '1';
/* SEO Settings */
var $sef = '0';
var $sef_rewrite = '0';
var $sef_suffix = '0';
/* Feed Settings */
var $feed_limit = 10;
var $log_path = '{VAR_LOG_PATH|addslashes}';

2
libraries/joomla/application/component/view.php
View File

@ -177,6 +177,8 @@ class JView extends JObject
} else {
$this->setLayout('default');
}
$this->baseurl = JURI::base(true);
}
/**

60
libraries/joomla/application/router.php
View File

@ -49,20 +49,12 @@ class JRouter extends JObject
var $_vars = array();
/**
* An route prefix
* An array of rules
*
* @access protected
* @var string
* @var array
*/
var $_prefix = null;
/**
* An route suffix
*
* @access protected
* @var string
*/
var $_suffix = null;
var $_rules = array();
/**
* Class constructor
@ -76,14 +68,6 @@ class JRouter extends JObject
} else {
$this->_mode = JROUTER_MODE_RAW;
}
if(array_key_exists('prefix', $options)) {
$this->_prefix = $options['prefix'];
}
if(array_key_exists('suffix', $options)) {
$this->_suffix = $options['suffix'];
}
}
/**
@ -148,13 +132,9 @@ class JRouter extends JObject
//Get the route
$path = $uri->getPath();
//Transform the route
$host = $uri->toString( array('scheme', 'host', 'port'));
$base = str_replace($host.'/', '', JURI::base());
$path = str_replace($base, '', $path); //Remove basepath
$path = str_replace($this->_suffix, '', $path); //Remove suffix
$path = str_replace(JURI::base(true), '', $path); //Remove basepath
$path = preg_replace('/index[\d]?.php/', '', $path); //Remove prefix
//Set the route back
@ -190,31 +170,21 @@ class JRouter extends JObject
//Create the URI object
$uri =& $this->_createURI($url);
//Process the uri information based on custom defined rules
$route = $this->_processBuildRules($uri);
// Build RAW URL
if($this->_mode == JROUTER_MODE_RAW) {
$route .= $this->_buildRawRoute($uri);
$this->_buildRawRoute($uri);
}
// Build SEF URL : mysite/route/index.php?var=x
if ($this->_mode == JROUTER_MODE_SEF) {
$route .= $this->_buildSefRoute($uri);
$this->_buildSefRoute($uri);
}
//Append and prepend informatio to the route
if(!empty($route))
{
//Append the route with the suffix
$route = $route.$this->_suffix;
//Prepend the route with a delimiter if needed
$route = !empty($this->_prefix) ? '/'.$route : $route;
}
//Process the uri information based on custom defined rules
$this->_processBuildRules($uri);
//Create the route
$url = $this->_prefix.$route.$uri->toString(array('query', 'fragment'));
$url = $uri->toString(array('path', 'query', 'fragment'));
return $url;
}
@ -295,7 +265,7 @@ class JRouter extends JObject
function getVars() {
return $this->_vars;
}
/**
* Function to convert a raw route to an internal URI
*
@ -326,7 +296,7 @@ class JRouter extends JObject
*/
function _buildRawRoute(&$uri)
{
return '';
}
/**
@ -337,7 +307,7 @@ class JRouter extends JObject
*/
function _buildSefRoute(&$uri)
{
return '';
}
/**

9
libraries/joomla/document/html/html.php
View File

@ -221,14 +221,17 @@ class JDocumentHTML extends JDocument
if (is_readable( $directory.DS.$template.DS.'params.ini' ) )
{
$content = file_get_contents($directory.DS.$template.DS.'params.ini');
$this->params = new JParameter($content);
$params = new JParameter($content);
}
// Load the language file for the template
$lang =& JFactory::getLanguage();
$lang->load( 'tpl_'.$template );
$this->template =& $template;
// Assign the variables
$this->template = $template;
$this->baseurl = JURI::base(true);
$this->params = $params;
// load
$data = $this->_loadTemplate($directory.DS.$template, $file);
@ -313,7 +316,7 @@ class JDocumentHTML extends JDocument
{
$path = str_replace( JPATH_BASE . DS, '', $dir );
$path = str_replace( '\\', '/', $path );
$this->addFavicon( $path . 'favicon.ico' );
$this->addFavicon( JURI::base(true).'/'.$path . 'favicon.ico' );
break;
}
}

35
libraries/joomla/environment/uri.php
View File

@ -195,34 +195,35 @@ class JURI extends JObject
*
* @access public
* @static
* @param boolean $pathonly If true, prepend the scheme, host and port information. Default is false.
* @return string The base URI string
* @since 1.5
*/
function base()
function base($pathonly = false)
{
static $base;
static $prefix;
// Get the scheme
if(!isset($prefix))
{
$uri =& JURI::getInstance();
$prefix = $uri->toString( array('scheme', 'host', 'port'));
}
// Get the base request URL if not set
// Get the base request path
if (!isset($base))
{
$uri =& JURI::getInstance();
$base = $uri->getScheme().'://';
$base .= $uri->getHost();
if ($port = $uri->getPort()) {
$base .= ':'.$port;
}
if (strpos(php_sapi_name(), 'cgi') !== false && !empty($_SERVER['REQUEST_URI'])) {
//Apache CGI
$base .= rtrim(dirname($_SERVER['PHP_SELF']), '/\\').'/';
$base = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
} else {
//Others
$base .= rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\').'/';
$base = rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
}
}
return $base;
return $pathonly === false ? $prefix.$base.'/' : $base;
}
/**
@ -239,13 +240,13 @@ class JURI extends JObject
// Get the current URL
if (!isset($current))
{
$uri = & JFactory::getURI();
$current = $uri->toString( array('scheme', 'host', 'port', 'path'));
$uri = & JURI::getInstance();
$current = $uri->toString( array('scheme', 'host', 'port', 'path'));
}
return $current;
}
/**
* Parse a given URI and populate the class fields
*

2
libraries/joomla/html/html.php
View File

@ -154,7 +154,7 @@ class JHTML
JHTML::_('behavior.mootools');
}
$base = $mainframe->isAdmin() ? $mainframe->getSiteURL() : JURI::base();
$base = $mainframe->isAdmin() ? $mainframe->getSiteURL() : JURI::base(true).'/';
$document = &JFactory::getDocument();
$document->addScript( $base.$path.$filename );

3
libraries/joomla/html/html/image.php
View File

@ -80,6 +80,9 @@ class JHTMLImage
if (substr($src, 0, 1 ) == "/") {
$src = substr_replace($src, '', 0, 1);
}
// Prepend the base path
$src = JURI::base(true).'/'.$src;
// outputs actual html <img> tag
if ($asTag) {

31
modules/mod_breadcrumbs/helper.php
View File

@ -53,38 +53,13 @@ class modBreadCrumbsHelper
function setSeparator($custom = null)
{
global $mainframe;
/**
* If a custom separator has not been provided we try to load a template
* specific one first, and if that is not present we load the default separator
*/
if ($custom == null)
{
// Set path for what would be a template specific separator
$tSepPath = 'templates/'.$mainframe->getTemplate().'/images/arrow.png';
// Check to see if the template specific separator exists and if so, set it
if (is_file(JPATH_SITE."/$tSepPath")) {
$_separator = '<img src="'.$tSepPath.'" border="0" alt="arrow" />';
}
else
{
// Template specific separator does not exist, use the default separator
$dSepPath = '/images/M_images/arrow.png';
// Check to make sure the default separator exists
if (is_file(JPATH_SITE.$dSepPath)) {
$_separator = '<img src="images/M_images/arrow.png" alt="arrow" />';
}
else {
// The default separator does not exist either ... just use a bracket
$_separator = '&gt;';
}
}
}
else
{
$_separator = $custom;
if ($custom == null) {
$_separator = JHTML::_('image.site', 'arrow.png');
}
return $_separator;
}

5
plugins/system/legacy/functions.php
View File

@ -871,7 +871,10 @@ function mosToolTip( $tooltip, $title='', $width='', $image='tooltip.png', $text
* @deprecated As of version 1.5
*/
function sefRelToAbs($value) {
return JRoute::_($value);
$uri = JURI::getInstance();
$prefix = $uri->toString(array('scheme', 'host', 'port'));
return $prefix.JRoute::_($value);
}

4
templates/beez/component.php
View File

@ -16,10 +16,10 @@ defined( '_JEXEC' ) or die( 'Restricted access' );
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/template.css" type="text/css" />
<?php if($this->direction == 'rtl') : ?>
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template_rtl.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/template_rtl.css" type="text/css" />
<?php endif; ?>
</head>
<body class="contentpane">

2
templates/beez/html/com_contact/contact/default_form.php
View File

@ -3,7 +3,6 @@ defined('_JEXEC') or die('Restricted access');
?>
<script type="text/javascript">
<!--
function validateForm( frm ) {
var valid = document.formvalidator.isValid(frm);
if (valid == false) {
@ -18,7 +17,6 @@ defined('_JEXEC') or die('Restricted access');
frm.submit();
}
}
// -->
</script>
<form action="<?php echo JRoute::_('index.php'); ?>" class="form-validate" method="post" name="emailForm" id="emailForm">

2
templates/beez/html/com_content/article/default.php
View File

@ -43,7 +43,7 @@ endif; ?>
<?php if ($this->print) :
echo JHTML::_('icon.print_screen', $this->article, $this->params, $this->access);
elseif ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?>
<img src="templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<img src="<?php echo $this->baseurl ?>/templates/beez/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<?php if ($this->params->get('show_pdf_icon')) :
echo JHTML::_('icon.pdf', $this->article, $this->params, $this->access);
endif;

2
templates/beez/html/com_content/category/blog_item.php
View File

@ -26,7 +26,7 @@ endif; ?>
<?php if ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?>
<p class="buttonheading">
<img src="templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<img src="<?php echo $this->baseurl ?>/templates/beez/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<?php if ($this->params->get('show_pdf_icon')) :
echo JHTML::_('icon.pdf', $this->item, $this->params, $this->access);
endif;

2
templates/beez/html/com_content/frontpage/default_item.php
View File

@ -26,7 +26,7 @@ endif; ?>
<?php if ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?>
<p class="buttonheading">
<img src="templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<img src="<?php echo $this->baseurl ?>/templates/beez/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<?php if ($this->params->get('show_pdf_icon')) :
echo JHTML::_('icon.pdf', $this->item, $this->params, $this->access);
endif;

2
templates/beez/html/com_content/section/blog_item.php
View File

@ -26,7 +26,7 @@ endif; ?>
<?php if ($this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?>
<p class="buttonheading">
<img src="templates/<?php echo $mainframe->getTemplate(); ?>/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<img src="<?php echo $this->baseurl ?>/templates/beez/images/trans.gif" alt="<?php echo JText::_('attention open in a new window'); ?>" />
<?php if ($this->params->get('show_pdf_icon')) :
echo JHTML::_('icon.pdf', $this->item, $this->params, $this->access);
endif;

2
templates/beez/html/com_user/user/form.php
View File

@ -3,7 +3,6 @@ defined('_JEXEC') or die('Restricted access');
?>
<script language="javascript" type="text/javascript">
//<![CDATA[
function submitbutton( pressbutton ) {
var form = document.userform;
var r = new RegExp("[\<|\>|\"|\'|\%|\;|\(|\)|\&|\+|\-]", "i");
@ -31,7 +30,6 @@ function submitbutton( pressbutton ) {
form.submit();
}
}
//]]>
</script>
<h1 class="componentheading">

6
templates/beez/html/mod_login/default.php
View File

@ -42,12 +42,12 @@ if ($type == 'logout') : ?>
<input type="checkbox" name="remember" id="mod_login_remember" class="checkbox" value="yes" alt="<?php echo JText::_('Remember me'); ?>" />
<input type="submit" name="Submit" class="button" value="<?php echo JText::_('BUTTON_LOGIN'); ?>" />
<p>
<a href="<?php echo JRoute::_('index.php?option=com_user&view=reset'); ?>#content">
<a href="<?php echo JRoute::_('index.php?option=com_user&view=reset#content'); ?>">
<?php echo JText::_('FORGOT_YOUR_PASSWORD'); ?>
</a>
</p>
<p>
<a href="<?php echo JRoute::_('index.php?option=com_user&view=remind'); ?>#content">
<a href="<?php echo JRoute::_('index.php?option=com_user&view=remind#content'); ?>">
<?php echo JText::_('FORGOT_YOUR_USERNAME'); ?>
</a>
</p>
@ -55,7 +55,7 @@ if ($type == 'logout') : ?>
if ($usersConfig->get('allowUserRegistration')) : ?>
<p>
<?php echo JText::_('No account yet?'); ?>
<a href="<?php echo JRoute::_('index.php?option=com_user&amp;task=register'); ?>#content">
<a href="<?php echo JRoute::_('index.php?option=com_user&amp;task=register#content'); ?>">
<?php echo JText::_('Register'); ?>
</a>
</p>

24
templates/beez/index.php
View File

@ -21,31 +21,31 @@ $showRightColumn &= JRequest::getCmd('task') != 'edit'
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>" >
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template.css" type="text/css" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/position.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/layout.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/print.css" type="text/css" media="Print" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/general.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/template.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/position.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/layout.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/print.css" type="text/css" media="Print" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/beez/css/general.css" type="text/css" />
<!--[if lte IE 6]>
<link href="templates/<?php echo $this->template ?>/css/ieonly.css" rel="stylesheet" type="text/css" />
<link href="<?php echo $this->baseurl ?>/templates/beez/css/ieonly.css" rel="stylesheet" type="text/css" />
<![endif]-->
<!--[if IE 7]>
<link href="templates/<?php echo $this->template ?>/css/ie7only.css" rel="stylesheet" type="text/css" />
<link href="<?php echo $this->baseurl ?>/templates/beez/css/ie7only.css" rel="stylesheet" type="text/css" />
<![endif]-->
<script type="text/javascript" src="templates/<?php echo $this->template ?>/javascript/md_stylechanger.js"></script>
<script type="text/javascript" src="<?php echo $this->baseurl ?>/templates/beez/javascript/md_stylechanger.js"></script>
</head>
<body>
<div id="all">
<div id="header">
<h1 id="logo">
<img src="templates/<?php echo $this->template ?>/images/logo.gif" border="0" alt="<?php echo JText::_('Logo Beez, Three little Bees'); ?>" width="300" height="97" />
<img src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/images/logo.gif" border="0" alt="<?php echo JText::_('Logo Beez, Three little Bees'); ?>" width="300" height="97" />
<span class="header1"><?php echo JText::_('Joomla Accessible Template'); ?></span>
</h1>
<ul>
<li><a href="<?php $url->setFragment('content'); echo htmlspecialchars($url->toString());?>" class="u2"><?php echo JText::_('Skip to Content'); ?></a></li>
<li><a href="<?php $url->setFragment('mainmenu'); echo htmlspecialchars($url->toString());?>" class="u2"><?php echo JText::_('Jump to Main Navigation and Login'); ?></a></li>
<li><a href="<?php $url->setFragment('additional'); echo htmlspecialchars($url->toString());?>" class="u2"><?php echo JText::_('Jump to additional Information'); ?></a></li>
<li><a href="#content" class="u2"><?php echo JText::_('Skip to Content'); ?></a></li>
<li><a href="#mainmenu" class="u2"><?php echo JText::_('Jump to Main Navigation and Login'); ?></a></li>
<li><a href="#additional" class="u2"><?php echo JText::_('Jump to additional Information'); ?></a></li>
</ul>
<h2 class="unsichtbar">

4
templates/rhuk_milkyway/component.php
View File

@ -16,10 +16,10 @@ defined( '_JEXEC' ) or die( 'Restricted access' );
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template.css" type="text/css" />
<?php if($this->direction == 'rtl') : ?>
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template_rtl.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template_rtl.css" type="text/css" />
<?php endif; ?>
</head>
<body class="contentpane">

16
templates/rhuk_milkyway/index.php
View File

@ -17,17 +17,17 @@ defined( '_JEXEC' ) or die( 'Restricted access' );
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/system/css/system.css" type="text/css" />
<link rel="stylesheet" href="templates/system/css/general.css" type="text/css" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template.css" type="text/css" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/<?php echo $this->params->get('colorVariation'); ?>.css" type="text/css" />
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/<?php echo $this->params->get('backgroundVariation'); ?>_bg.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/system.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/<?php echo $this->params->get('colorVariation'); ?>.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/<?php echo $this->params->get('backgroundVariation'); ?>_bg.css" type="text/css" />
<!--[if lte IE 6]>
<link href="templates/<?php echo $this->template ?>/css/ieonly.css" rel="stylesheet" type="text/css" />
<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/ieonly.css" rel="stylesheet" type="text/css" />
<![endif]-->
bt
<?php if($this->direction == 'rtl') : ?>
<link href="templates/<?php echo $this->template ?>/css/template_rtl.css" rel="stylesheet" type="text/css" />
<link href="<?php echo $this->baseurl ?>/templates/rhuk_milkyway/css/template_rtl.css" rel="stylesheet" type="text/css" />
<?php endif; ?>
</head>

8
templates/system/403.php
View File

@ -10,16 +10,14 @@
*/
// no direct access
defined( '_JEXEC' ) or die( 'Restricted access' );
jimport('joomla.environment.uri');
defined( '_JEXEC' ) or die( 'Restricted access' );
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<title>403 - <?php echo $this->title; ?></title>
<base href="<?php echo JURI::base() ?>" />
<link rel="stylesheet" href="templates/system/css/error.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/error.css" type="text/css" />
</head>
<body>
<div align="center">

4
templates/system/404.php
View File

@ -12,14 +12,12 @@
// no direct access
defined( '_JEXEC' ) or die( 'Restricted access' );
jimport('joomla.environment.uri');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<title>404 - <?php echo $this->title; ?></title>
<base href="<?php echo JURI::base() ?>" />
<link rel="stylesheet" href="templates/system/css/error.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/error.css" type="text/css" />
</head>
<body>
<div align="center">

5
templates/system/500.php
View File

@ -11,15 +11,12 @@
// no direct access
defined( '_JEXEC' ) or die( 'Restricted access' );
jimport('joomla.environment.uri');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<title>500 - <?php echo $this->title; ?></title>
<base href="<?php echo JURI::base() ?>" />
<link rel="stylesheet" href="templates/system/css/error.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/error.css" type="text/css" />
</head>
<body>
<div align="center">

6
templates/system/component.php
View File

@ -16,11 +16,11 @@ defined( '_JEXEC' ) or die( 'Restricted access' );
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/system/css/general.css" type="text/css" />
<link rel="stylesheet" href="templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<?php if($this->direction == 'rtl') : ?>
<link rel="stylesheet" href="templates/<?php echo $this->template ?>/css/template_rtl.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/template_rtl.css" type="text/css" />
<?php endif; ?>
</head>
<body class="contentpane">

4
templates/system/offline.php
View File

@ -16,8 +16,8 @@ defined( '_JEXEC' ) or die( 'Restricted access' );
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/system/css/offline.css" type="text/css" />
<link rel="stylesheet" href="templates/system/css/general.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/offline.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" />
</head>
<body>
<jdoc:include type="message" />