29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-08-04 18:20:29 +00:00

Cleaned up the site and administrator index.php files.

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@11438 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Rob Schley 2009-01-25 03:12:08 +00:00
parent 19afef76c4
commit 92e017759a
3 changed files with 79 additions and 87 deletions

View File

@ -6,66 +6,63 @@
* @license GNU General Public License, see LICENSE.php
*/
// Set flag that this is a parent file
define( '_JEXEC', 1 );
define('JPATH_BASE', dirname(__FILE__) );
// Set flag that this is a parent file.
define('_JEXEC', 1);
define('JPATH_BASE', dirname(__FILE__));
define('DS', DIRECTORY_SEPARATOR);
require_once JPATH_BASE .DS.'includes'.DS.'defines.php';
require_once JPATH_BASE .DS.'includes'.DS.'framework.php';
require_once JPATH_BASE .DS.'includes'.DS.'helper.php';
require_once JPATH_BASE .DS.'includes'.DS.'toolbar.php';
try {
require_once JPATH_BASE.DS.'includes'.DS.'defines.php';
require_once JPATH_BASE.DS.'includes'.DS.'framework.php';
require_once JPATH_BASE.DS.'includes'.DS.'helper.php';
require_once JPATH_BASE.DS.'includes'.DS.'toolbar.php';
JDEBUG ? $_PROFILER->mark( 'afterLoad' ) : null;
// Mark afterLoad in the profiler.
JDEBUG ? $_PROFILER->mark('afterLoad') : null;
/**
* CREATE THE APPLICATION
*
* NOTE :
*/
$mainframe =& JFactory::getApplication('administrator');
/*
* Instantiate the application.
*/
$mainframe =& JFactory::getApplication('administrator');
/**
* INITIALISE THE APPLICATION
*
* NOTE :
*/
$mainframe->initialise(array(
'language' => $mainframe->getUserState( "application.lang", 'lang' )
));
// Profiling
JDEBUG ? $_PROFILER->mark('afterInitialise') : null;
/*
* Initialise the application.
*/
$mainframe->initialise(array('language' => $mainframe->getUserState('application.lang', 'lang')));
/**
* ROUTE THE APPLICATION
*
* NOTE :
*/
$mainframe->route();
// Profiling
JDEBUG ? $_PROFILER->mark('afterRoute') : null;
// Mark afterIntialise in the profiler.
JDEBUG ? $_PROFILER->mark('afterInitialise') : null;
/**
* DISPATCH THE APPLICATION
*
* NOTE :
*/
$mainframe->dispatch();
// Profiling
JDEBUG ? $_PROFILER->mark('afterDispatch') : null;
/*
* Route the application.
*/
$mainframe->route();
/**
* RENDER THE APPLICATION
*
* NOTE :
*/
$mainframe->render();
// Profiling
JDEBUG ? $_PROFILER->mark( 'afterRender' ) : null;
// Mark afterRoute in the profiler.
JDEBUG ? $_PROFILER->mark('afterRoute') : null;
/**
* RETURN THE RESPONSE
*/
echo JResponse::toString($mainframe->getCfg('gzip'));
/*
* Dispatch the application.
*/
$mainframe->dispatch();
// Mark afterDispatch in the profiler.
JDEBUG ? $_PROFILER->mark('afterDispatch') : null;
/*
* Render the application.
*/
$mainframe->render();
// Mark afterRender in the profiler.
JDEBUG ? $_PROFILER->mark('afterRender') : null;
/*
* Return the response.
*/
echo JResponse::toString($mainframe->getCfg('gzip'));
}
catch (JException $e) {
$e->set('level', E_ERROR);
JError::throwError($e);
}

View File

@ -6,67 +6,61 @@
* @license GNU General Public License, see LICENSE.php
*/
// Set flag that this is a parent file
// Set flag that this is a parent file.
define('_JEXEC', 1);
define('JPATH_BASE', dirname(__FILE__));
define('DS', DIRECTORY_SEPARATOR);
try {
require_once JPATH_BASE .DS.'includes'.DS.'defines.php';
require_once JPATH_BASE .DS.'includes'.DS.'framework.php';
require_once JPATH_BASE.DS.'includes'.DS.'defines.php';
require_once JPATH_BASE.DS.'includes'.DS.'framework.php';
// Mark afterLoad in the profiler.
JDEBUG ? $_PROFILER->mark('afterLoad') : null;
/**
* CREATE THE APPLICATION
*
* NOTE :
/*
* Instantiate the application.
*/
$mainframe =& JFactory::getApplication('site');
/**
* INITIALISE THE APPLICATION
*
* NOTE :
/*
* Initialise the application.
*/
$mainframe->initialise();
// profiling
// Mark afterIntialise in the profiler.
JDEBUG ? $_PROFILER->mark('afterInitialise') : null;
/**
* ROUTE THE APPLICATION
*
* NOTE :
/*
* Route the application.
*/
$mainframe->route();
// profiling
// Mark afterRoute in the profiler.
JDEBUG ? $_PROFILER->mark('afterRoute') : null;
/**
* DISPATCH THE APPLICATION
*
* NOTE :
/*
* Dispatch the application.
*/
$mainframe->dispatch();
// Profiling
// Mark afterDispatch in the profiler.
JDEBUG ? $_PROFILER->mark('afterDispatch') : null;
/**
* RENDER THE APPLICATION
*
* NOTE :
/*
* Render the application.
*/
$mainframe->render();
// Profiling
// Mark afterRender in the profiler.
JDEBUG ? $_PROFILER->mark('afterRender') : null;
/**
* RETURN THE RESPONSE
/*
* Return the response.
*/
echo JResponse::toString($mainframe->getCfg('gzip'));
} catch (JException $e) {
}
catch (JException $e) {
$e->set('level', E_ERROR);
JError::throwError($e);
}
}

View File

@ -29,6 +29,7 @@ Do not forget to update this page on the wiki when making changes relevant to de
http://docs.joomla.org/index.php?title=Version_1.6_Developer_Notes
25-Jan-2009 Rob Schley
^ Cleaned up the site and administrator index.php files.
- Removed Foood icons from the administrator and site.
- Removed images/stories, images/smilies, and images/M_images and other old images.