joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-08-26 04:59:48 +00:00
Code Packages Releases Activity

[#28650] Use legacy aliases for the MVC in the site

Browse Source
This commit is contained in:
Rouven Weßling 2012-06-18 09:51:25 -07:00 committed by Mark Dexter
parent e109535635
commit 7636c40677
75 changed files with 99 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/com_banners/banners.php
View File

@ -8,10 +8,7 @@
defined('_JEXEC') or die;
// Include dependancies
jimport('joomla.application.component.controller');
// Execute the task.
$controller = JController::getInstance('Banners');
$controller = JControllerLegacy::getInstance('Banners');
$controller->execute(JRequest::getVar('task', 'click'));
$controller->redirect();

5
components/com_banners/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Banners Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_banners
* @since 1.5
*/
class BannersController extends JController
class BannersController extends JControllerLegacy
{
function click()
{

4
components/com_banners/models/banner.php
View File

@ -6,10 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
jimport('joomla.application.component.helper');
JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
@ -20,7 +18,7 @@ JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
* @package Joomla.Site
* @subpackage com_banners
*/
class BannersModelBanner extends JModel
class BannersModelBanner extends JModelLegacy
{
protected $_item;

6
components/com_contact/contact.php
View File

@ -6,12 +6,10 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT.'/helpers/route.php';
require_once JPATH_COMPONENT . '/helpers/route.php';
$controller = JController::getInstance('Contact');
$controller = JControllerLegacy::getInstance('Contact');
$controller->execute(JRequest::getCmd('task'));
$controller->redirect();

5
components/com_contact/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Contact Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_contact
* @since 1.5
*/
class ContactController extends JController
class ContactController extends JControllerLegacy
{
/**
* Method to display a view.

5
components/com_contact/models/categories.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
/**
* This models supports retrieving lists of contact categories.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.model');
* @subpackage com_contact
* @since 1.6
*/
class ContactModelCategories extends JModel
class ContactModelCategories extends JModelLegacy
{
/**
* Model context string.

2
components/com_contact/models/contact.php
View File

@ -340,7 +340,7 @@ class ContactModelContact extends JModelForm
//get the profile information for the linked user
require_once JPATH_ADMINISTRATOR.'/components/com_users/models/user.php';
$userModel = JModel::getInstance('User', 'UsersModel', array('ignore_request' => true));
$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
$data = $userModel->getItem((int)$result->user_id);
JPluginHelper::importPlugin('user');

5
components/com_contact/views/categories/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Content categories view.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_contact
* @since 1.6
*/
class ContactViewCategories extends JView
class ContactViewCategories extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_contact/views/category/view.feed.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Contact component
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_contact
* @since 1.5
*/
class ContactViewCategory extends JView
class ContactViewCategory extends JViewLegacy
{
function display()
{

5
components/com_contact/views/category/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Contacts component
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_contact
* @since 1.5
*/
class ContactViewCategory extends JView
class ContactViewCategory extends JViewLegacy
{
protected $state;
protected $items;

6
components/com_contact/views/contact/view.html.php
View File

@ -6,10 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
require_once JPATH_COMPONENT.'/models/category.php';
/**
@ -19,7 +17,7 @@ require_once JPATH_COMPONENT.'/models/category.php';
* @subpackage com_contact
* @since 1.5
*/
class ContactViewContact extends JView
class ContactViewContact extends JViewLegacy
{
protected $state;
protected $form;
@ -44,7 +42,7 @@ class ContactViewContact extends JView
$params->merge($item->params);
// Get Category Model data
$categoryModel = JModel::getInstance('Category', 'ContactModel', array('ignore_request' => true));
$categoryModel = JModelLegacy::getInstance('Category', 'ContactModel', array('ignore_request' => true));
$categoryModel->setState('category.id', $item->catid);
$categoryModel->setState('list.ordering', 'a.name');
$categoryModel->setState('list.direction', 'asc');

4
components/com_contact/views/contact/view.vcf.php
View File

@ -6,11 +6,9 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
class ContactViewContact extends JView
class ContactViewContact extends JViewLegacy
{
protected $state;
protected $item;

5
components/com_contact/views/featured/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Frontpage View class
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_contact
* @since 1.6
*/
class ContactViewFeatured extends JView
class ContactViewFeatured extends JViewLegacy
{
protected $state;
protected $items;

4
components/com_content/content.php
View File

@ -6,14 +6,12 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
// Include dependancies
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT.'/helpers/route.php';
require_once JPATH_COMPONENT.'/helpers/query.php';
$controller = JController::getInstance('Content');
$controller = JControllerLegacy::getInstance('Content');
$controller->execute(JRequest::getCmd('task'));
$controller->redirect();

5
components/com_content/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Content Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_content
* @since 1.5
*/
class ContentController extends JController
class ContentController extends JControllerLegacy
{
function __construct($config = array())
{

1
components/com_content/models/articles.php
View File

@ -4,7 +4,6 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.modellist');

5
components/com_content/models/categories.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
/**
* This models supports retrieving lists of article categories.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.model');
* @subpackage com_content
* @since 1.6
*/
class ContentModelCategories extends JModel
class ContentModelCategories extends JModelLegacy
{
/**
* Model context string.

3
components/com_content/models/category.php
View File

@ -6,7 +6,6 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.modellist');
@ -209,7 +208,7 @@ class ContentModelCategory extends JModelList
$limit = $this->getState('list.limit');
if ($this->_articles === null && $category = $this->getCategory()) {
$model = JModel::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model->setState('params', JFactory::getApplication()->getParams());
$model->setState('filter.category_id', $category->id);
$model->setState('filter.published', $this->getState('filter.published'));

5
components/com_content/views/archive/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Content component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewArchive extends JView
class ContentViewArchive extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_content/views/article/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML Article View class for the Content component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewArticle extends JView
class ContentViewArticle extends JViewLegacy
{
protected $item;
protected $params;

5
components/com_content/views/categories/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Content categories view.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewCategories extends JView
class ContentViewCategories extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_content/views/category/view.feed.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Content component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewCategory extends JView
class ContentViewCategory extends JViewLegacy
{
function display()
{

5
components/com_content/views/category/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Content component
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewCategory extends JView
class ContentViewCategory extends JViewLegacy
{
protected $state;
protected $items;

5
components/com_content/views/featured/view.feed.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Frontpage View class
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewFeatured extends JView
class ContentViewFeatured extends JViewLegacy
{
function display($tpl = null)
{

5
components/com_content/views/featured/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Frontpage View class
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewFeatured extends JView
class ContentViewFeatured extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_content/views/form/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML Article View class for the Content component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_content
* @since 1.5
*/
class ContentViewForm extends JView
class ContentViewForm extends JViewLegacy
{
protected $form;
protected $item;

4
components/com_finder/controller.php
View File

@ -9,8 +9,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
/**
@ -20,7 +18,7 @@ JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com
* @subpackage com_finder
* @since 2.5
*/
class FinderController extends JController
class FinderController extends JControllerLegacy
{
/**
* Method to display a view.

4
components/com_finder/controllers/suggestions.json.php
View File

@ -9,8 +9,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Suggestions JSON controller for Finder.
*
@ -18,7 +16,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_finder
* @since 2.5
*/
class FinderControllerSuggestions extends JController
class FinderControllerSuggestions extends JControllerLegacy
{
/**
* Method to find search query suggestions.

4
components/com_finder/finder.php
View File

@ -9,11 +9,9 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT . '/helpers/route.php';
// Execute the task.
$controller = JController::getInstance('Finder');
$controller = JControllerLegacy::getInstance('Finder');
$controller->execute(JFactory::getApplication()->input->get('task', '', 'word'));
$controller->redirect();

4
components/com_finder/views/search/view.feed.php
View File

@ -9,8 +9,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Search feed view class for the Finder package.
*
@ -18,7 +16,7 @@ jimport('joomla.application.component.view');
* @subpackage com_finder
* @since 2.5
*/
class FinderViewSearch extends JView
class FinderViewSearch extends JViewLegacy
{
/**
* Method to display the view.

4
components/com_finder/views/search/view.html.php
View File

@ -9,8 +9,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Search HTML view class for the Finder package.
*
@ -18,7 +16,7 @@ jimport('joomla.application.component.view');
* @subpackage com_finder
* @since 2.5
*/
class FinderViewSearch extends JView
class FinderViewSearch extends JViewLegacy
{
protected $query;
protected $params;

4
components/com_finder/views/search/view.opensearch.php
View File

@ -7,10 +7,8 @@
* @license GNU General Public License version 2 or later; see LICENSE
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
jimport('joomla.environment.uri');
/**
@ -20,7 +18,7 @@ jimport('joomla.environment.uri');
* @subpackage com_finder
* @since 2.5
*/
class FinderViewSearch extends JView
class FinderViewSearch extends JViewLegacy
{
/**
* Method to display the view.

6
components/com_mailto/controller.php
View File

@ -6,18 +6,14 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* @package Joomla.Site
* @subpackage com_mailto
*/
class MailtoController extends JController
class MailtoController extends JControllerLegacy
{
/**
* Show the form so that the user can send the link to someone
*

4
components/com_mailto/mailto.php
View File

@ -6,16 +6,14 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
jimport('joomla.application.component.helper');
require_once JPATH_COMPONENT.'/helpers/mailto.php';
require_once JPATH_COMPONENT.'/controller.php';
$controller = JController::getInstance('Mailto');
$controller = JControllerLegacy::getInstance('Mailto');
$controller->registerDefaultTask('mailto');
$controller->execute(JRequest::getCmd('task'));

5
components/com_mailto/views/mailto/view.html.php
View File

@ -6,12 +6,9 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
class MailtoViewMailto extends JView
class MailtoViewMailto extends JViewLegacy
{
function display($tpl = null)
{

3
components/com_mailto/views/sent/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
class MailtoViewSent extends JView
{
function display($tpl = null)

5
components/com_media/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Media Manager Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_media
* @version 1.5
*/
class MediaController extends JController
class MediaController extends JControllerLegacy
{
/**
* Method to display a view.

5
components/com_newsfeeds/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Newsfeeds Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_newsfeeds
* @since 1.5
*/
class NewsfeedsController extends JController
class NewsfeedsController extends JControllerLegacy
{
/**
* Method to show a newsfeeds view

5
components/com_newsfeeds/models/categories.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
/**
* This models supports retrieving lists of newsfeed categories.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.model');
* @subpackage com_newsfeeds
* @since 1.6
*/
class NewsfeedsModelCategories extends JModel
class NewsfeedsModelCategories extends JModelLegacy
{
/**
* Model context string.

4
components/com_newsfeeds/newsfeeds.php
View File

@ -6,14 +6,12 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
// Require the com_content helper library
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT.'/helpers/route.php';
JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
$controller = JController::getInstance('Newsfeeds');
$controller = JControllerLegacy::getInstance('Newsfeeds');
$controller->execute(JRequest::getCmd('task'));
$controller->redirect();

5
components/com_newsfeeds/views/categories/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Content categories view.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_newsfeeds
* @since 1.5
*/
class NewsfeedsViewCategories extends JView
class NewsfeedsViewCategories extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_newsfeeds/views/category/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Newsfeeds component
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_newsfeeds
* @since 1.0
*/
class NewsfeedsViewCategory extends JView
class NewsfeedsViewCategory extends JViewLegacy
{
protected $state;
protected $items;

7
components/com_newsfeeds/views/newsfeed/view.html.php
View File

@ -7,11 +7,8 @@
*
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the Newsfeeds component
*
@ -20,7 +17,7 @@ jimport('joomla.application.component.view');
* @subpackage com_newsfeeds
* @since 1.0
*/
class NewsfeedsViewNewsfeed extends JView
class NewsfeedsViewNewsfeed extends JViewLegacy
{
/**
* @var object
@ -59,7 +56,7 @@ class NewsfeedsViewNewsfeed extends JView
if ($item) {
// Get Category Model data
$categoryModel = JModel::getInstance('Category', 'NewsfeedsModel', array('ignore_request' => true));
$categoryModel = JModelLegacy::getInstance('Category', 'NewsfeedsModel', array('ignore_request' => true));
$categoryModel->setState('category.id', $item->catid);
$categoryModel->setState('list.ordering', 'a.name');
$categoryModel->setState('list.direction', 'asc');

5
components/com_search/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Search Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_search
* @since 1.5
*/
class SearchController extends JController
class SearchController extends JControllerLegacy
{
/**
* Method to display a view.

5
components/com_search/models/search.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
/**
* Search Component Search Model
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.model');
* @subpackage com_search
* @since 1.5
*/
class SearchModelSearch extends JModel
class SearchModelSearch extends JModelLegacy
{
/**
* Sezrch data array

5
components/com_search/search.php
View File

@ -6,13 +6,10 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
// Create the controller
$controller = JController::getInstance('Search');
$controller = JControllerLegacy::getInstance('Search');
// Perform the Request task
$controller->execute(JRequest::getCmd('task'));

5
components/com_search/views/search/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the search component
*
@ -19,7 +16,7 @@ jimport('joomla.application.component.view');
* @subpackage com_search
* @since 1.0
*/
class SearchViewSearch extends JView
class SearchViewSearch extends JViewLegacy
{
function display($tpl = null)
{

4
components/com_search/views/search/view.opensearch.php
View File

@ -6,10 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
jimport('joomla.environment.uri');
/**
@ -20,7 +18,7 @@ jimport('joomla.environment.uri');
* @subpackage Search
* @since 1.7
*/
class SearchViewSearch extends JView
class SearchViewSearch extends JViewLegacy
{
function display($tpl = null)
{

4
components/com_users/controller.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Base controller class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_users
* @since 1.5
*/
class UsersController extends JController
class UsersController extends JControllerLegacy
{
/**
* Method to display a view.

3
components/com_users/users.php
View File

@ -9,10 +9,9 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT.'/helpers/route.php';
// Launch the controller.
$controller = JController::getInstance('Users');
$controller = JControllerLegacy::getInstance('Users');
$controller->execute(JRequest::getCmd('task', 'display'));
$controller->redirect();

4
components/com_users/views/login/view.html.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Login view class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_users
* @since 1.5
*/
class UsersViewLogin extends JView
class UsersViewLogin extends JViewLegacy
{
protected $form;
protected $params;

4
components/com_users/views/profile/view.html.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Profile view class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_users
* @since 1.6
*/
class UsersViewProfile extends JView
class UsersViewProfile extends JViewLegacy
{
protected $data;
protected $form;

4
components/com_users/views/registration/view.html.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Registration view class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_users
* @since 1.6
*/
class UsersViewRegistration extends JView
class UsersViewRegistration extends JViewLegacy
{
protected $data;
protected $form;

4
components/com_users/views/remind/view.html.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Registration view class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_users
* @since 1.5
*/
class UsersViewRemind extends JView
class UsersViewRemind extends JViewLegacy
{
protected $form;
protected $params;

4
components/com_users/views/reset/view.html.php
View File

@ -8,8 +8,6 @@
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Reset view class for Users.
*
@ -17,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_users
* @since 1.5
*/
class UsersViewReset extends JView
class UsersViewReset extends JViewLegacy
{
protected $form;
protected $params;

5
components/com_weblinks/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Weblinks Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_weblinks
* @since 1.5
*/
class WeblinksController extends JController
class WeblinksController extends JControllerLegacy
{
/**
* Method to display a view.

5
components/com_weblinks/models/categories.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
/**
* This models supports retrieving lists of article categories.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.model');
* @subpackage com_weblinks
* @since 1.6
*/
class WeblinksModelCategories extends JModel
class WeblinksModelCategories extends JModelLegacy
{
/**
* Model context string.

5
components/com_weblinks/views/categories/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* Content categories view.
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_weblinks
* @since 1.5
*/
class WeblinksViewCategories extends JView
class WeblinksViewCategories extends JViewLegacy
{
protected $state = null;
protected $item = null;

5
components/com_weblinks/views/category/view.feed.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the WebLinks component
*
@ -19,7 +16,7 @@ jimport('joomla.application.component.view');
* @subpackage com_weblinks
* @since 1.0
*/
class WeblinksViewCategory extends JView
class WeblinksViewCategory extends JViewLegacy
{
function display($tpl = null)
{

5
components/com_weblinks/views/category/view.html.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the WebLinks component
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.view');
* @subpackage com_weblinks
* @since 1.5
*/
class WeblinksViewCategory extends JView
class WeblinksViewCategory extends JViewLegacy
{
protected $state;
protected $items;

5
components/com_weblinks/views/form/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML Article View class for the Weblinks component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_weblinks
* @since 1.5
*/
class WeblinksViewForm extends JView
class WeblinksViewForm extends JViewLegacy
{
protected $form;
protected $item;

5
components/com_weblinks/views/weblink/view.html.php
View File

@ -4,11 +4,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* HTML View class for the WebLinks component
*
@ -16,7 +13,7 @@ jimport('joomla.application.component.view');
* @subpackage com_weblinks
* @since 1.5
*/
class WeblinksViewWeblink extends JView
class WeblinksViewWeblink extends JViewLegacy
{
protected $state;
protected $item;

4
components/com_weblinks/weblinks.php
View File

@ -6,12 +6,10 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access.
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
require_once JPATH_COMPONENT.'/helpers/route.php';
$controller = JController::getInstance('Weblinks');
$controller = JControllerLegacy::getInstance('Weblinks');
$controller->execute(JRequest::getCmd('task'));
$controller->redirect();

5
components/com_wrapper/controller.php
View File

@ -6,11 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.controller');
/**
* Content Component Controller
*
@ -18,7 +15,7 @@ jimport('joomla.application.component.controller');
* @subpackage com_wrapper
* @since 1.5
*/
class WrapperController extends JController
class WrapperController extends JControllerLegacy
{
/**
* Method to display a view.

5
components/com_wrapper/views/wrapper/view.html.php
View File

@ -6,16 +6,13 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.view');
/**
* @package Joomla.Site
* @subpackage com_wrapper
*/
class WrapperViewWrapper extends JView
class WrapperViewWrapper extends JViewLegacy
{
public function display($tpl = null)
{

6
components/com_wrapper/wrapper.php
View File

@ -6,12 +6,8 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
// Include dependancies
jimport('joomla.application.component.controller');
$controller = JController::getInstance('Wrapper');
$controller = JControllerLegacy::getInstance('Wrapper');
$controller->execute(JRequest::getCmd('task'));
$controller->redirect();

1
installation/CHANGELOG
View File

@ -29,6 +29,7 @@ $ -> Language fix or change
18-June-2012 Mark Dexter
+ Add update xml files to build folder
# [#28554] Mark JXMLElement as deprecated and don't use it in type hinting
# [#28650] Use legacy aliases for the MVC in the site
-------------------- 2.5.5 Stable Release [18-June-2012] ------------------

15
libraries/cms/model/legacy.php
View File

@ -20,4 +20,19 @@ jimport('joomla.application.component.model');
*/
class JModelLegacy extends JModel
{
/**
* Add a directory where JModel should search for models. You may
* either pass a string or an array of directories.
*
* @param mixed $path A path or array[sting] of paths to search.
* @param string $prefix A prefix for models.
*
* @return array An array with directory elements. If prefix is equal to '', all directories are returned.
*
* @since 2.5.5
*/
public static function addIncludePath($path = '', $prefix = '')
{
return parent::addIncludePath($path, $prefix);
}
}

13
modules/mod_articles_category/helper.php
View File

@ -6,25 +6,20 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
$com_path = JPATH_SITE.'/components/com_content/';
require_once $com_path.'router.php';
require_once $com_path.'helpers/route.php';
jimport('joomla.application.component.model');
JModel::addIncludePath($com_path . '/models', 'ContentModel');
JModelLegacy::addIncludePath($com_path . '/models', 'ContentModel');
abstract class modArticlesCategoryHelper
{
public static function getList(&$params)
{
// Get an instance of the generic articles model
$articles = JModel::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$articles = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
// Set application parameters in model
$app = JFactory::getApplication();
@ -64,7 +59,7 @@ abstract class modArticlesCategoryHelper
if (!$catid) {
// Get an instance of the generic article model
$article = JModel::getInstance('Article', 'ContentModel', array('ignore_request' => true));
$article = JModelLegacy::getInstance('Article', 'ContentModel', array('ignore_request' => true));
$article->setState('params', $appParams);
$article->setState('filter.published', 1);
@ -107,7 +102,7 @@ abstract class modArticlesCategoryHelper
if ($catids) {
if ($params->get('show_child_category_articles', 0) && (int) $params->get('levels', 0) > 0) {
// Get an instance of the generic categories model
$categories = JModel::getInstance('Categories', 'ContentModel', array('ignore_request' => true));
$categories = JModelLegacy::getInstance('Categories', 'ContentModel', array('ignore_request' => true));
$categories->setState('params', $appParams);
$levels = $params->get('levels', 1) ? $params->get('levels', 1) : 9999;
$categories->setState('filter.get_children', $levels);

7
modules/mod_articles_latest/helper.php
View File

@ -6,14 +6,11 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
require_once JPATH_SITE.'/components/com_content/helpers/route.php';
jimport('joomla.application.component.model');
JModel::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
JModelLegacy::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
abstract class modArticlesLatestHelper
{
@ -23,7 +20,7 @@ abstract class modArticlesLatestHelper
$db = JFactory::getDbo();
// Get an instance of the generic articles model
$model = JModel::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
// Set application parameters in model
$app = JFactory::getApplication();

7
modules/mod_articles_news/helper.php
View File

@ -6,14 +6,11 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
require_once JPATH_SITE.'/components/com_content/helpers/route.php';
jimport('joomla.application.component.model');
JModel::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
JModelLegacy::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
abstract class modArticlesNewsHelper
{
@ -23,7 +20,7 @@ abstract class modArticlesNewsHelper
$db = JFactory::getDbo();
// Get an instance of the generic articles model
$model = JModel::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
// Set application parameters in model
$appParams = JFactory::getApplication()->getParams();

7
modules/mod_articles_popular/helper.php
View File

@ -6,21 +6,18 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
require_once JPATH_SITE.'/components/com_content/helpers/route.php';
jimport('joomla.application.component.model');
JModel::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
JModelLegacy::addIncludePath(JPATH_SITE.'/components/com_content/models', 'ContentModel');
abstract class modArticlesPopularHelper
{
public static function getList(&$params)
{
// Get an instance of the generic articles model
$model = JModel::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
// Set application parameters in model
$app = JFactory::getApplication();

8
modules/mod_banners/helper.php
View File

@ -6,22 +6,18 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
class modBannersHelper
{
static function &getList(&$params)
{
jimport('joomla.application.component.model');
JModel::addIncludePath(JPATH_ROOT.'/components/com_banners/models', 'BannersModel');
JModelLegacy::addIncludePath(JPATH_ROOT.'/components/com_banners/models', 'BannersModel');
$document = JFactory::getDocument();
$app = JFactory::getApplication();
$keywords = explode(',', $document->getMetaData('keywords'));
$model = JModel::getInstance('Banners', 'BannersModel', array('ignore_request'=>true));
$model = JModelLegacy::getInstance('Banners', 'BannersModel', array('ignore_request'=>true));
$model->setState('filter.client_id', (int) $params->get('cid'));
$model->setState('filter.category_id', $params->get('catid', array()));
$model->setState('list.limit', (int) $params->get('count', 1));

7
modules/mod_weblinks/helper.php
View File

@ -6,13 +6,10 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// no direct access
defined('_JEXEC') or die;
jimport('joomla.application.component.model');
require_once JPATH_SITE . '/components/com_weblinks/helpers/route.php';
JModel::addIncludePath(JPATH_SITE . '/components/com_weblinks/models', 'WeblinksModel');
JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_weblinks/models', 'WeblinksModel');
class modWeblinksHelper
{
@ -20,7 +17,7 @@ class modWeblinksHelper
{
// Get an instance of the generic articles model
$model = JModel::getInstance('Category', 'WeblinksModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Category', 'WeblinksModel', array('ignore_request' => true));
// Set application parameters in model
$app = JFactory::getApplication();

5
plugins/content/joomla/joomla.php
View File

@ -4,7 +4,6 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
// No direct access
defined('_JEXEC') or die;
/**
@ -46,7 +45,7 @@ class plgContentJoomla extends JPlugin
$user = JFactory::getUser();
// Messaging for new items
JModel::addIncludePath(JPATH_ADMINISTRATOR.'/components/com_messages/models', 'MessagesModel');
JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR.'/components/com_messages/models', 'MessagesModel');
JTable::addIncludePath(JPATH_ADMINISTRATOR.'/components/com_messages/tables');
$db = JFactory::getDbo();
@ -68,7 +67,7 @@ class plgContentJoomla extends JPlugin
'subject' => $lang->_('COM_CONTENT_NEW_ARTICLE'),
'message' => sprintf($lang->_('COM_CONTENT_ON_NEW_CONTENT'), $user->get('name'), $article->title)
);
$model_message = JModel::getInstance('Message', 'MessagesModel');
$model_message = JModelLegacy::getInstance('Message', 'MessagesModel');
$model_message->save($message);
}
}