forked from joomla/joomla-cms
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '4.0-dev' into fix#24235
- Loading branch information
Showing
193 changed files
with
8,285 additions
and
2,015 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
...trator/components/com_userlogs/access.xml → ...ator/components/com_actionlogs/access.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...ator/components/com_userlogs/userlogs.php → .../components/com_actionlogs/actionlogs.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
<?php | ||
/** | ||
* @package Joomla.Administrator | ||
* @subpackage com_userlogs | ||
* @subpackage com_actionlogs | ||
* | ||
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
* @license GNU General Public License version 2 or later; see LICENSE.txt | ||
*/ | ||
|
||
defined('_JEXEC') or die; | ||
|
||
if (!JFactory::getUser()->authorise('core.manage', 'com_userlogs')) | ||
if (!JFactory::getUser()->authorise('core.manage', 'com_actionlogs')) | ||
{ | ||
throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403); | ||
} | ||
|
||
$controller = JControllerLegacy::getInstance('Userlogs'); | ||
$controller = JControllerLegacy::getInstance('Actionlogs'); | ||
$controller->execute(JFactory::getApplication()->input->get('task')); | ||
$controller->redirect(); | ||
$controller->redirect(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<config> | ||
<fieldset name="actionlogs" label="COM_ACTIONLOGS_OPTIONS" addfieldpath="/administrator/components/com_actionlogs/models/fields"> | ||
<field | ||
name="ip_logging" | ||
type="radio" | ||
label="COM_ACTIONLOGS_IP_LOGGING" | ||
description="COM_ACTIONLOGS_IP_LOGGING_DESC" | ||
class="btn-group btn-group-yesno" | ||
default="0" | ||
> | ||
<option value="1">JYES</option> | ||
<option value="0">JNO</option> | ||
</field> | ||
<field | ||
name="csv_delimiter" | ||
type="list" | ||
label="COM_ACTIONLOGS_CSV_DELIMITER" | ||
description="COM_ACTIONLOGS_CSV_DELIMITER_DESC" | ||
default="," | ||
> | ||
<option value=",">COM_ACTIONLOGS_COMMA</option> | ||
<option value=";">COM_ACTIONLOGS_SEMICOLON</option> | ||
</field> | ||
<field | ||
name="loggable_extensions" | ||
type="logtype" | ||
label="COM_ACTIONLOGS_LOG_EXTENSIONS" | ||
description="COM_ACTIONLOGS_LOG_EXTENSIONS_DESC" | ||
multiple="true" | ||
default="com_banners,com_cache,com_categories,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users" | ||
/> | ||
</fieldset> | ||
<fieldset | ||
name="permissions" | ||
label="JCONFIG_PERMISSIONS_LABEL" | ||
description="JCONFIG_PERMISSIONS_DESC" | ||
> | ||
<field | ||
name="rules" | ||
type="rules" | ||
label="JCONFIG_PERMISSIONS_LABEL" | ||
class="inputbox" | ||
validate="rules" | ||
filter="rules" | ||
component="com_actionlogs" | ||
section="component" | ||
/> | ||
</fieldset> | ||
</config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.