diff --git a/src/administrator/controllers/database.php b/src/administrator/controllers/database.php index 690eb77..5cda846 100755 --- a/src/administrator/controllers/database.php +++ b/src/administrator/controllers/database.php @@ -10,12 +10,17 @@ defined('_JEXEC') or die; +use Joomla\CMS\MVC\Controller\BaseController; +use Joomla\CMS\Factory; +use Joomla\CMS\MVC\Model\BaseDatabaseModel; +use Joomla\CMS\Router\Route; + /** * Installer Database Controller * * @since 2.5 */ -class SubusersControllerDatabase extends JControllerLegacy +class SubusersControllerDatabase extends BaseController { /** * Tries to fix missing database updates @@ -28,19 +33,19 @@ class SubusersControllerDatabase extends JControllerLegacy public function fix() { // Get a handle to the Joomla! application object - $application = JFactory::getApplication(); + $application = Factory::getApplication(); $model = $this->getModel('database'); $model->fix(); // Purge updates - JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/models', 'JoomlaupdateModel'); - $updateModel = JModelLegacy::getInstance('default', 'JoomlaupdateModel'); + BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/models', 'JoomlaupdateModel'); + $updateModel = BaseDatabaseModel::getInstance('default', 'JoomlaupdateModel'); $updateModel->purge(); // Refresh versionable assets cache - JFactory::getApplication()->flushAssets(); + Factory::getApplication()->flushAssets(); - $this->setRedirect(JRoute::_('index.php?option=com_subusers&view=organizations', false)); + $this->setRedirect(Route::_('index.php?option=com_subusers&view=organizations', false)); } } diff --git a/src/administrator/helpers/subusers.php b/src/administrator/helpers/subusers.php index ab7a9f0..b26a68f 100755 --- a/src/administrator/helpers/subusers.php +++ b/src/administrator/helpers/subusers.php @@ -9,6 +9,7 @@ */ defined('_JEXEC') or die(); +use Joomla\CMS\Language\Text; /** * Subusers helper. @@ -26,9 +27,9 @@ class SubusersHelper */ public static function addSubmenu($vName = '') { - JHtmlSidebar::addEntry(JText::_('COM_SUBUSERS_TITLE_ROLES'), 'index.php?option=com_subusers&view=roles', $vName == 'roles'); - JHtmlSidebar::addEntry(JText::_('COM_SUBUSERS_TITLE_ACTIONS'), 'index.php?option=com_subusers&view=actions', $vName == 'actions'); - JHtmlSidebar::addEntry(JText::_('COM_SUBUSERS_TITLE_MAPPINGS'), 'index.php?option=com_subusers&view=mappings', $vName == 'mappings'); - JHtmlSidebar::addEntry(JText::_('COM_SUBUSERS_TITLE_USERS'), 'index.php?option=com_subusers&view=users', $vName == 'users'); + JHtmlSidebar::addEntry(Text::_('COM_SUBUSERS_TITLE_ROLES'), 'index.php?option=com_subusers&view=roles', $vName == 'roles'); + JHtmlSidebar::addEntry(Text::_('COM_SUBUSERS_TITLE_ACTIONS'), 'index.php?option=com_subusers&view=actions', $vName == 'actions'); + JHtmlSidebar::addEntry(Text::_('COM_SUBUSERS_TITLE_MAPPINGS'), 'index.php?option=com_subusers&view=mappings', $vName == 'mappings'); + JHtmlSidebar::addEntry(Text::_('COM_SUBUSERS_TITLE_USERS'), 'index.php?option=com_subusers&view=users', $vName == 'users'); } } diff --git a/src/administrator/libraries/action.php b/src/administrator/libraries/action.php index 3822273..53d40f1 100644 --- a/src/administrator/libraries/action.php +++ b/src/administrator/libraries/action.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Language\Text; /** * Action class. Handles all application interaction with a Action @@ -160,7 +161,7 @@ public function bind(&$array) { if (empty($array)) { - $this->setError(JText::_('COM_SUBUSER_EMPTY_DATA')); + $this->setError(Text::_('COM_SUBUSER_EMPTY_DATA')); return false; } @@ -168,7 +169,7 @@ public function bind(&$array) // Bind the array if (!$this->setProperties($array)) { - $this->setError(\JText::_('COM_SUBUSER_BINDING_ERROR')); + $this->setError(Text::_('COM_SUBUSER_BINDING_ERROR')); return false; } diff --git a/src/administrator/libraries/role.php b/src/administrator/libraries/role.php index ce92559..4a154a6 100644 --- a/src/administrator/libraries/role.php +++ b/src/administrator/libraries/role.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Language\Text; /** * Role class. Handles all application interaction with a Role @@ -168,7 +169,7 @@ public function bind(&$array) { if (empty($array)) { - $this->setError(JText::_('COM_CLUSTER_EMPTY_DATA')); + $this->setError(Text::_('COM_CLUSTER_EMPTY_DATA')); return false; } @@ -176,7 +177,7 @@ public function bind(&$array) // Bind the array if (!$this->setProperties($array)) { - $this->setError(\JText::_('COM_CLUSTER_BINDING_ERROR')); + $this->setError(Text::_('COM_CLUSTER_BINDING_ERROR')); return false; } diff --git a/src/administrator/models/database.php b/src/administrator/models/database.php index d0486df..850afd7 100755 --- a/src/administrator/models/database.php +++ b/src/administrator/models/database.php @@ -9,6 +9,8 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Schema\ChangeSet; require_once JPATH_ADMINISTRATOR . '/components/com_installer/models/database.php'; @@ -30,11 +32,11 @@ public function getItems() try { - $changeSet = JSchemaChangeset::getInstance($this->getDbo(), $folder); + $changeSet = ChangeSet::getInstance($this->getDbo(), $folder); } catch (RuntimeException $e) { - JFactory::getApplication()->enqueueMessage($e->getMessage(), 'warning'); + Factory::getApplication()->enqueueMessage($e->getMessage(), 'warning'); return false; } diff --git a/src/administrator/models/fields/action.php b/src/administrator/models/fields/action.php index 72446fb..6792137 100644 --- a/src/administrator/models/fields/action.php +++ b/src/administrator/models/fields/action.php @@ -12,8 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Form\FormHelper; -JFormHelper::loadFieldClass('list'); +FormHelper::loadFieldClass('list'); /** * Supports an HTML select list of Roles diff --git a/src/administrator/models/fields/role.php b/src/administrator/models/fields/role.php index 095e82d..eb8ec69 100644 --- a/src/administrator/models/fields/role.php +++ b/src/administrator/models/fields/role.php @@ -13,8 +13,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Form\FormHelper; -JFormHelper::loadFieldClass('list'); +FormHelper::loadFieldClass('list'); /** * Supports an HTML select list of Roles diff --git a/src/administrator/models/role.php b/src/administrator/models/role.php index cd83518..ec053f2 100755 --- a/src/administrator/models/role.php +++ b/src/administrator/models/role.php @@ -81,7 +81,7 @@ public function getForm($data = array(), $loadData = true) protected function loadFormData() { // Check the session for previously entered form data. - $data = JFactory::getApplication()->getUserState('com_subusers.edit.role.data', array()); + $data = Factory::getApplication()->getUserState('com_subusers.edit.role.data', array()); if (empty($data)) { @@ -107,7 +107,7 @@ protected function loadFormData() */ public function getActions($roleId) { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select('action'); $query->from($db->quoteName('#__tjsu_role_action_map')); diff --git a/src/administrator/models/roles.php b/src/administrator/models/roles.php index 373632c..5c5590c 100755 --- a/src/administrator/models/roles.php +++ b/src/administrator/models/roles.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\ListModel; +use Joomla\CMS\Component\ComponentHelper; /** * Methods supporting a list of Subusers records. @@ -63,7 +64,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc') $this->setState('filter.search', $search); // Load the parameters. - $params = JComponentHelper::getParams('com_subusers'); + $params = ComponentHelper::getParams('com_subusers'); $this->setState('params', $params); parent::populateState($ordering, $direction); diff --git a/src/administrator/models/user.php b/src/administrator/models/user.php index b814b2b..84100c9 100755 --- a/src/administrator/models/user.php +++ b/src/administrator/models/user.php @@ -83,7 +83,7 @@ public function getForm($data = array(), $loadData = true) protected function loadFormData() { // Check the session for previously entered form data. - $data = JFactory::getApplication()->getUserState('com_subusers.edit.user.data', array()); + $data = Factory::getApplication()->getUserState('com_subusers.edit.user.data', array()); if (empty($data)) { diff --git a/src/administrator/models/users.php b/src/administrator/models/users.php index a054d5c..179431d 100755 --- a/src/administrator/models/users.php +++ b/src/administrator/models/users.php @@ -10,7 +10,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\ListModel; +use Joomla\CMS\Component\ComponentHelper; /** * Methods supporting a list of Subusers records. @@ -57,14 +59,14 @@ public function __construct($config = array()) */ protected function populateState($ordering = null, $direction = null) { - $app = JFactory::getApplication('administrator'); + $app = Factory::getApplication('administrator'); $search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); $this->setState('filter.user_id', $app->getUserStateFromRequest($this->context . ' . filter.user_id', 'filter_user_id', '', 'string')); - $params = JComponentHelper::getParams('com_subusers'); + $params = ComponentHelper::getParams('com_subusers'); $this->setState('params', $params); parent::populateState('a.id', 'desc'); diff --git a/src/administrator/sql/install.mysql.utf8.sql b/src/administrator/sql/install.mysql.utf8.sql index b5a118d..86cea9a 100755 --- a/src/administrator/sql/install.mysql.utf8.sql +++ b/src/administrator/sql/install.mysql.utf8.sql @@ -58,8 +58,14 @@ CREATE TABLE IF NOT EXISTS `#__tjsu_users` ( `modified_by` int(11) NOT NULL, `modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) + KEY `user_id_idx` (`user_id`) + KEY `client_id_idx` (`client_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; INSERT INTO `#__tjsu_roles` (`id`, `name`, `client`, `created_by`, `created_date`, `modified_by`, `modified_date`, `ordering`) VALUES (1, 'Organization Manager', 'com_multiagency', 0, '0000-00-00 00:00:00', 0, '0000-00-00 00:00:00', 1), (2, 'Organization User', 'com_multiagency', 0, '0000-00-00 00:00:00', 0, '0000-00-00 00:00:00', 2); + +INSERT INTO `#__tjsu_actions` (`id`, `code`, `name`, `client`, `created_date`) VALUES +(1, 'core.agency.user.delete', 'Remove user from agency', 'com_multiagency', '0000-00-00 00:00:00'), +(2, 'core.agency.delete', 'Remove agency', 'com_multiagency', '0000-00-00 00:00:00'); diff --git a/src/administrator/sql/updates/mysql/1.0.sql b/src/administrator/sql/updates/mysql/1.0.sql deleted file mode 100755 index 8b13789..0000000 --- a/src/administrator/sql/updates/mysql/1.0.sql +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/administrator/sql/updates/mysql/1.1.0.sql b/src/administrator/sql/updates/mysql/1.1.0.sql new file mode 100755 index 0000000..735f87d --- /dev/null +++ b/src/administrator/sql/updates/mysql/1.1.0.sql @@ -0,0 +1,13 @@ + +ALTER TABLE `#__tjsu_roles` ENGINE = InnoDB; +ALTER TABLE `#__tjsu_actions` ENGINE = InnoDB; +ALTER TABLE `#__tjsu_role_action_map` ENGINE = InnoDB; +ALTER TABLE `#__tjsu_users` ENGINE = InnoDB; + +ALTER TABLE `#__tjsu_roles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__tjsu_actions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__tjsu_role_action_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__tjsu_users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +ALTER TABLE #__tjsu_users ADD INDEX user_id_idx (user_id); +ALTER TABLE #__tjsu_users ADD INDEX client_id_idx (client_id); diff --git a/src/administrator/subusers.php b/src/administrator/subusers.php index c971a1c..3caaf7f 100755 --- a/src/administrator/subusers.php +++ b/src/administrator/subusers.php @@ -12,11 +12,12 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\Controller\BaseController; +use Joomla\CMS\Language\Text; // Access check. if (!Factory::getUser()->authorise('core.manage', 'com_subusers')) { - throw new \Exception(JText::_('JERROR_ALERTNOAUTHOR')); + throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR')); } \JLoader::import("/components/com_subusers/includes/rbacl", JPATH_ADMINISTRATOR); diff --git a/src/administrator/tables/mapping.php b/src/administrator/tables/mapping.php index a6f26af..4c65ce9 100755 --- a/src/administrator/tables/mapping.php +++ b/src/administrator/tables/mapping.php @@ -12,13 +12,18 @@ defined('_JEXEC') or die; use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Table\Table; +use Joomla\CMS\Factory; +use Joomla\CMS\Access\Access; +use Joomla\CMS\Language\Text; +use Joomla\Registry\Registry; /** * mapping Table class * * @since 1.6 */ -class SubusersTablemapping extends JTable +class SubusersTablemapping extends Table { /** * Constructor @@ -45,38 +50,38 @@ public function bind($array, $ignore = '') { if ($array['id'] == 0) { - $array['created_by'] = JFactory::getUser()->id; + $array['created_by'] = Factory::getUser()->id; } - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $task = $input->getString('task', ''); - if (($task == 'save' || $task == 'apply') && (!JFactory::getUser()->authorise('core.edit.state', 'com_subusers') && $array['state'] == 1)) + if (($task == 'save' || $task == 'apply') && (!Factory::getUser()->authorise('core.edit.state', 'com_subusers') && $array['state'] == 1)) { $array['state'] = 0; } if (isset($array['params']) && is_array($array['params'])) { - $registry = new JRegistry; + $registry = new Registry; $registry->loadArray($array['params']); $array['params'] = (string) $registry; } if (isset($array['metadata']) && is_array($array['metadata'])) { - $registry = new JRegistry; + $registry = new Registry; $registry->loadArray($array['metadata']); $array['metadata'] = (string) $registry; } - if (!JFactory::getUser()->authorise('core.admin', 'com_subusers.mapping.' . $array['id'])) + if (!Factory::getUser()->authorise('core.admin', 'com_subusers.mapping.' . $array['id'])) { - $actions = JAccess::getActionsFromFile( + $actions = Access::getActionsFromFile( JPATH_ADMINISTRATOR . '/components/com_subusers/access.xml', "/access/section[@name='mapping']/" ); - $default_actions = JAccess::getAssetRules('com_subusers.mapping.' . $array['id'])->getData(); + $default_actions = Access::getAssetRules('com_subusers.mapping.' . $array['id'])->getData(); $array_jaccess = array(); foreach ($actions as $action) @@ -174,7 +179,9 @@ public function publish($pks = null, $state = 1, $userId = 0) // Nothing to set publishing state on, return false. else { - throw new Exception(500, JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); + $this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); + + return false; } } @@ -216,6 +223,8 @@ public function publish($pks = null, $state = 1, $userId = 0) $this->state = $state; } + $this->setError(''); + return true; } @@ -243,10 +252,10 @@ protected function _getAssetName() * * @return mixed The id on success, false on failure. */ - protected function _getAssetParentId(JTable $table = null, $id = null) + protected function _getAssetParentId(Table $table = null, $id = null) { // We will retrieve the parent-asset from the Asset-table - $assetParent = JTable::getInstance('Asset'); + $assetParent = Table::getInstance('Asset'); // Default: if no asset-parent can be found we take the global asset $assetParentId = $assetParent->getRootId(); diff --git a/src/administrator/views/action/view.html.php b/src/administrator/views/action/view.html.php index a7b2729..9f54f9f 100755 --- a/src/administrator/views/action/view.html.php +++ b/src/administrator/views/action/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View to edit @@ -63,7 +66,7 @@ public function display($tpl = null) $this->item = $this->get('Item'); $this->form = $this->get('Form'); - $this->canDo = JHelperContent::getActions('com_subusers', 'action', $this->item->id); + $this->canDo = ContentHelper::getActions('com_subusers', 'action', $this->item->id); if (count($errors = $this->get('Errors'))) { @@ -91,7 +94,7 @@ protected function addToolbar() $layout = Factory::getApplication()->input->get("layout"); $this->sidebar = JHtmlSidebar::render(); - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_ACTION'), 'action.png'); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_ACTION'), 'action.png'); // For new records, check the create permission. if ($layout != "default") @@ -100,22 +103,22 @@ protected function addToolbar() if ($isNew) { - JToolbarHelper::save('action.save'); - JToolbarHelper::save2new('action.save2new'); - JToolbarHelper::cancel('action.cancel'); + ToolbarHelper::save('action.save'); + ToolbarHelper::save2new('action.save2new'); + ToolbarHelper::cancel('action.cancel'); } else { if ($this->isEditable($canDo, $user->id)) { - JToolbarHelper::save('action.save'); + ToolbarHelper::save('action.save'); } - JToolbarHelper::cancel('action.cancel', 'JTOOLBAR_CLOSE'); + ToolbarHelper::cancel('action.cancel', 'JTOOLBAR_CLOSE'); } } - JToolbarHelper::divider(); + ToolbarHelper::divider(); } /** diff --git a/src/administrator/views/actions/view.html.php b/src/administrator/views/actions/view.html.php index 324251e..bd69e5f 100755 --- a/src/administrator/views/actions/view.html.php +++ b/src/administrator/views/actions/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View class for a list of Subusers. @@ -94,7 +97,7 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->user = Factory::getUser(); - $this->canDo = JHelperContent::getActions('com_subusers'); + $this->canDo = ContentHelper::getActions('com_subusers'); if (count($errors = $this->get('Errors'))) { @@ -118,30 +121,30 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_ACTIONS'), ''); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_ACTIONS'), ''); $canDo = $this->canDo; if ($canDo->get('core.create')) { - JToolbarHelper::addNew('action.add'); + ToolbarHelper::addNew('action.add'); } if ($canDo->get('core.edit')) { - JToolbarHelper::editList('actions.edit'); + ToolbarHelper::editList('actions.edit'); } if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'actions.delete', 'JTOOLBAR_DELETE'); - JToolbarHelper::divider(); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'actions.delete', 'JTOOLBAR_DELETE'); + ToolbarHelper::divider(); } if ($canDo->get('core.admin') || $canDo->get('core.options')) { - JToolbarHelper::preferences('com_subusers'); - JToolbarHelper::divider(); + ToolbarHelper::preferences('com_subusers'); + ToolbarHelper::divider(); } } } diff --git a/src/administrator/views/mapping/view.html.php b/src/administrator/views/mapping/view.html.php index c1c460f..65e15d4 100755 --- a/src/administrator/views/mapping/view.html.php +++ b/src/administrator/views/mapping/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View to edit @@ -63,7 +66,7 @@ public function display($tpl = null) $this->item = $this->get('Item'); $this->form = $this->get('Form'); - $this->canDo = JHelperContent::getActions('com_subusers', 'mapping', $this->item->id); + $this->canDo = ContentHelper::getActions('com_subusers', 'mapping', $this->item->id); if (count($errors = $this->get('Errors'))) { @@ -91,7 +94,7 @@ protected function addToolbar() $layout = Factory::getApplication()->input->get("layout"); $this->sidebar = JHtmlSidebar::render(); - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_MAPPING'), 'mapping.png'); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_MAPPING'), 'mapping.png'); // For new records, check the create permission. if ($layout != "default") @@ -100,22 +103,22 @@ protected function addToolbar() if ($isNew) { - JToolbarHelper::save('mapping.save'); - JToolbarHelper::save2new('mapping.save2new'); - JToolbarHelper::cancel('mapping.cancel'); + ToolbarHelper::save('mapping.save'); + ToolbarHelper::save2new('mapping.save2new'); + ToolbarHelper::cancel('mapping.cancel'); } else { if ($this->isEditable($canDo, $user->id)) { - JToolbarHelper::save('mapping.save'); + ToolbarHelper::save('mapping.save'); } - JToolbarHelper::cancel('mapping.cancel', 'JTOOLBAR_CLOSE'); + ToolbarHelper::cancel('mapping.cancel', 'JTOOLBAR_CLOSE'); } } - JToolbarHelper::divider(); + ToolbarHelper::divider(); } /** diff --git a/src/administrator/views/mappings/view.html.php b/src/administrator/views/mappings/view.html.php index 54d2431..774623d 100755 --- a/src/administrator/views/mappings/view.html.php +++ b/src/administrator/views/mappings/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View class for a list of Subusers. @@ -72,7 +75,7 @@ class SubusersViewMappings extends HtmlView /** * An ACL object to verify user rights. * - * @var CMSObject + * @var Joomla\CMS\Object\CMSObject * @since 1.0.0 */ protected $canDo; @@ -94,7 +97,7 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->user = Factory::getUser(); - $this->canDo = JHelperContent::getActions('com_subusers'); + $this->canDo = ContentHelper::getActions('com_subusers'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -119,28 +122,28 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_MAPPINGS'), ''); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_MAPPINGS'), ''); if ($this->canDo->get('core.create')) { - JToolbarHelper::addNew('mapping.add'); + ToolbarHelper::addNew('mapping.add'); } if ($this->canDo->get('core.edit')) { - JToolbarHelper::editList('mapping.edit'); + ToolbarHelper::editList('mapping.edit'); } if ($this->canDo->get('core.delete')) { - JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'mappings.delete', 'JTOOLBAR_DELETE'); - JToolbarHelper::divider(); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'mappings.delete', 'JTOOLBAR_DELETE'); + ToolbarHelper::divider(); } if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolbarHelper::preferences('com_subusers'); - JToolbarHelper::divider(); + ToolbarHelper::preferences('com_subusers'); + ToolbarHelper::divider(); } } } diff --git a/src/administrator/views/role/view.html.php b/src/administrator/views/role/view.html.php index 1628e05..0fe8c66 100755 --- a/src/administrator/views/role/view.html.php +++ b/src/administrator/views/role/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View to edit @@ -63,7 +66,7 @@ public function display($tpl = null) $this->item = $this->get('Item'); $this->form = $this->get('Form'); - $this->canDo = JHelperContent::getActions('com_subusers', 'role', $this->item->id); + $this->canDo = ContentHelper::getActions('com_subusers', 'role', $this->item->id); if (count($errors = $this->get('Errors'))) { @@ -91,7 +94,7 @@ protected function addToolbar() $layout = Factory::getApplication()->input->get("layout"); $this->sidebar = JHtmlSidebar::render(); - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_ROLE'), 'role.png'); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_ROLE'), 'role.png'); // For new records, check the create permission. if ($layout != "default") @@ -100,22 +103,22 @@ protected function addToolbar() if ($isNew) { - JToolbarHelper::save('role.save'); - JToolbarHelper::save2new('role.save2new'); - JToolbarHelper::cancel('role.cancel'); + ToolbarHelper::save('role.save'); + ToolbarHelper::save2new('role.save2new'); + ToolbarHelper::cancel('role.cancel'); } else { if ($this->isEditable($canDo, $user->id)) { - JToolbarHelper::save('role.save'); + ToolbarHelper::save('role.save'); } - JToolbarHelper::cancel('role.cancel', 'JTOOLBAR_CLOSE'); + ToolbarHelper::cancel('role.cancel', 'JTOOLBAR_CLOSE'); } } - JToolbarHelper::divider(); + ToolbarHelper::divider(); } /** diff --git a/src/administrator/views/roles/view.html.php b/src/administrator/views/roles/view.html.php index 6343510..9594cd0 100755 --- a/src/administrator/views/roles/view.html.php +++ b/src/administrator/views/roles/view.html.php @@ -11,13 +11,17 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View class for a list of Subusers. * * @since 1.0.0 */ -class SubusersViewRoles extends JViewLegacy +class SubusersViewRoles extends HtmlView { /** * An array of items @@ -71,7 +75,7 @@ class SubusersViewRoles extends JViewLegacy /** * An ACL object to verify user rights. * - * @var CMSObject + * @var Joomla\CMS\Object\CMSObject * @since 1.0.0 */ protected $canDo; @@ -93,7 +97,7 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->user = Factory::getUser(); - $this->canDo = JHelperContent::getActions('com_subusers'); + $this->canDo = ContentHelper::getActions('com_subusers'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -118,28 +122,28 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_ROLES'), ''); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_ROLES'), ''); if ($this->canDo->get('core.create')) { - JToolbarHelper::addNew('role.add'); + ToolbarHelper::addNew('role.add'); } if ($this->canDo->get('core.edit')) { - JToolbarHelper::editList('role.edit'); + ToolbarHelper::editList('role.edit'); } if ($this->canDo->get('core.delete')) { - JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'roles.delete', 'JTOOLBAR_DELETE'); - JToolbarHelper::divider(); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'roles.delete', 'JTOOLBAR_DELETE'); + ToolbarHelper::divider(); } if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolbarHelper::preferences('com_subusers'); - JToolbarHelper::divider(); + ToolbarHelper::preferences('com_subusers'); + ToolbarHelper::divider(); } } } diff --git a/src/administrator/views/user/view.html.php b/src/administrator/views/user/view.html.php index 068d88f..d295171 100755 --- a/src/administrator/views/user/view.html.php +++ b/src/administrator/views/user/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View to edit @@ -63,7 +66,7 @@ public function display($tpl = null) $this->item = $this->get('Item'); $this->form = $this->get('Form'); - $this->canDo = JHelperContent::getActions('com_subusers', 'user', $this->item->id); + $this->canDo = ContentHelper::getActions('com_subusers', 'user', $this->item->id); if (count($errors = $this->get('Errors'))) { @@ -91,7 +94,7 @@ protected function addToolbar() $layout = Factory::getApplication()->input->get("layout"); $this->sidebar = JHtmlSidebar::render(); - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_USER'), 'user.png'); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_USER'), 'user.png'); // For new records, check the create permission. if ($layout != "default") @@ -100,22 +103,22 @@ protected function addToolbar() if ($isNew) { - JToolbarHelper::save('user.save'); - JToolbarHelper::save2new('user.save2new'); - JToolbarHelper::cancel('user.cancel'); + ToolbarHelper::save('user.save'); + ToolbarHelper::save2new('user.save2new'); + ToolbarHelper::cancel('user.cancel'); } else { if ($this->isEditable($canDo, $user->id)) { - JToolbarHelper::save('user.save'); + ToolbarHelper::save('user.save'); } - JToolbarHelper::cancel('user.cancel', 'JTOOLBAR_CLOSE'); + ToolbarHelper::cancel('user.cancel', 'JTOOLBAR_CLOSE'); } } - JToolbarHelper::divider(); + ToolbarHelper::divider(); } /** diff --git a/src/administrator/views/users/view.html.php b/src/administrator/views/users/view.html.php index e89dafa..c9510bd 100755 --- a/src/administrator/views/users/view.html.php +++ b/src/administrator/views/users/view.html.php @@ -12,6 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\View\HtmlView; +use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Toolbar\ToolbarHelper; /** * View class for a list of Subusers. @@ -94,7 +97,7 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->user = Factory::getUser(); - $this->canDo = JHelperContent::getActions('com_subusers'); + $this->canDo = ContentHelper::getActions('com_subusers'); if (count($errors = $this->get('Errors'))) { @@ -118,30 +121,30 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolBarHelper::title(JText::_('COM_SUBUSERS_TITLE_USERS'), 'users.png'); + ToolBarHelper::title(Text::_('COM_SUBUSERS_TITLE_USERS'), 'users.png'); $canDo = $this->canDo; if ($canDo->get('core.create')) { - JToolbarHelper::addNew('user.add'); + ToolbarHelper::addNew('user.add'); } if ($canDo->get('core.edit')) { - JToolbarHelper::editList('users.edit'); + ToolbarHelper::editList('users.edit'); } if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'users.delete', 'JTOOLBAR_DELETE'); - JToolbarHelper::divider(); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'users.delete', 'JTOOLBAR_DELETE'); + ToolbarHelper::divider(); } if ($canDo->get('core.admin') || $canDo->get('core.options')) { - JToolbarHelper::preferences('com_subusers'); - JToolbarHelper::divider(); + ToolbarHelper::preferences('com_subusers'); + ToolbarHelper::divider(); } } }