Merge branch 'permissionfix' into 2.4

pull/1106/head
Iglocska 2016-04-18 17:41:59 +02:00
commit 24c7fa61fe
226 changed files with 5 additions and 5 deletions

0
.gitmodules vendored Executable file → Normal file
View File

0
INSTALL/INSTALL.sysop.txt Executable file → Normal file
View File

0
INSTALL/UPGRADE.txt Executable file → Normal file
View File

0
INSTALL/build/technical_design/TD-ACL.txt Executable file → Normal file
View File

0
INSTALL/build/technical_design/TD-Audit.txt Executable file → Normal file
View File

0
INSTALL/build/technical_design/TD-forum.txt Executable file → Normal file
View File

0
LICENSE Executable file → Normal file
View File

0
app/.htaccess Executable file → Normal file
View File

0
app/Config/Schema/i18n.php Executable file → Normal file
View File

0
app/Config/Schema/i18n.sql Executable file → Normal file
View File

0
app/Config/Schema/note.txt Executable file → Normal file
View File

0
app/Config/Schema/sessions.php Executable file → Normal file
View File

0
app/Config/Schema/sessions.sql Executable file → Normal file
View File

0
app/Config/acl.ini.php Executable file → Normal file
View File

0
app/Config/acl.php Executable file → Normal file
View File

0
app/Config/bootstrap.default.php Executable file → Normal file
View File

View File

@ -151,7 +151,7 @@
* value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
* - `Session.defaults` - The default configuration set to use as a basis for your session.
* There are four builtins: php, cake, cache, database.
* - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables,
* - `Session.handler` - Can be used to enable a custom session handler. Expects an array of callables,
* that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler`
* to the ini array.
* - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and

View File

@ -154,7 +154,7 @@
* value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
* - `Session.defaults` - The default configuration set to use as a basis for your session.
* There are four builtins: php, cake, cache, database.
* - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables,
* - `Session.handler` - Can be used to enable a custom session handler. Expects an array of callables,
* that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler`
* to the ini array.
* - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and

0
app/Config/email.php Executable file → Normal file
View File

0
app/Config/routes.php Executable file → Normal file
View File

0
app/Console/Command/AppShell.php Executable file → Normal file
View File

0
app/Console/Command/EventShell.php Executable file → Normal file
View File

0
app/Console/Command/PasswordShell.php Executable file → Normal file
View File

0
app/Console/Command/Populate023Shell.php Executable file → Normal file
View File

0
app/Console/Command/Task/RoleIdTask.php Executable file → Normal file
View File

0
app/Console/Command/Task/RoleToAroAcoTask.php Executable file → Normal file
View File

0
app/Console/Command/Task/RolesTask.php Executable file → Normal file
View File

0
app/Console/Command/Task/UsersTask.php Executable file → Normal file
View File

0
app/Console/Command/Task/empty Executable file → Normal file
View File

0
app/Console/Templates/empty Executable file → Normal file
View File

0
app/Console/cake.php Executable file → Normal file
View File

0
app/Controller/AppController.php Executable file → Normal file
View File

0
app/Controller/AttributesController.php Executable file → Normal file
View File

0
app/Controller/Component/AdminCrudComponent.php Executable file → Normal file
View File

0
app/Controller/Component/SecureAuthComponent.php Executable file → Normal file
View File

0
app/Controller/Component/empty Executable file → Normal file
View File

0
app/Controller/EventsController.php Executable file → Normal file
View File

0
app/Controller/LogsController.php Executable file → Normal file
View File

0
app/Controller/PagesController.php Executable file → Normal file
View File

0
app/Controller/RegexpController.php Executable file → Normal file
View File

0
app/Controller/RolesController.php Executable file → Normal file
View File

0
app/Controller/ServersController.php Executable file → Normal file
View File

0
app/Controller/UsersController.php Executable file → Normal file
View File

0
app/Controller/WhitelistsController.php Executable file → Normal file
View File

0
app/Lib/CamelCase.php Executable file → Normal file
View File

0
app/Lib/empty Executable file → Normal file
View File

0
app/Locale/eng/LC_MESSAGES/empty Executable file → Normal file
View File

0
app/Model/AppModel.php Executable file → Normal file
View File

0
app/Model/Attribute.php Executable file → Normal file
View File

0
app/Model/Behavior/RegexpBehavior.php Executable file → Normal file
View File

0
app/Model/Behavior/TrimBehavior.php Executable file → Normal file
View File

0
app/Model/Behavior/empty Executable file → Normal file
View File

0
app/Model/Bruteforce.php Executable file → Normal file
View File

0
app/Model/Datasource/empty Executable file → Normal file
View File

0
app/Model/Dns.php Executable file → Normal file
View File

0
app/Model/Event.php Executable file → Normal file
View File

0
app/Model/Log.php Executable file → Normal file
View File

0
app/Model/Regexp.php Executable file → Normal file
View File

0
app/Model/Role.php Executable file → Normal file
View File

0
app/Model/Server.php Executable file → Normal file
View File

0
app/Model/User.php Executable file → Normal file
View File

0
app/Model/Whitelist.php Executable file → Normal file
View File

0
app/Plugin/UrlCache/Lib/Routing/UrlCacheManager.php Executable file → Normal file
View File

0
app/Plugin/UrlCache/View/Helper/UrlCacheAppHelper.php Executable file → Normal file
View File

0
app/Plugin/empty Executable file → Normal file
View File

0
app/Vendor/empty vendored Executable file → Normal file
View File

0
app/View/Attributes/add.ctp Executable file → Normal file
View File

0
app/View/Attributes/add_attachment.ctp Executable file → Normal file
View File

0
app/View/Attributes/check_composites.ctp Executable file → Normal file
View File

0
app/View/Attributes/edit.ctp Executable file → Normal file
View File

0
app/View/Attributes/index.ctp Executable file → Normal file
View File

0
app/View/Attributes/search.ctp Executable file → Normal file
View File

0
app/View/Attributes/xml/index.ctp Executable file → Normal file
View File

0
app/View/Elements/empty Executable file → Normal file
View File

0
app/View/Elements/global_menu.ctp Executable file → Normal file
View File

0
app/View/Elements/side_menu.ctp Executable file → Normal file
View File

0
app/View/Emails/html/default.ctp Executable file → Normal file
View File

0
app/View/Emails/text/body.ctp Executable file → Normal file
View File

0
app/View/Emails/text/default.ctp Executable file → Normal file
View File

0
app/View/Emails/text/new_event.ctp Executable file → Normal file
View File

0
app/View/Errors/error400.ctp Executable file → Normal file
View File

0
app/View/Errors/error403.ctp Executable file → Normal file
View File

0
app/View/Errors/error500.ctp Executable file → Normal file
View File

0
app/View/Errors/missing_connection.ctp Executable file → Normal file
View File

0
app/View/Errors/missing_datasource_config.ctp Executable file → Normal file
View File

0
app/View/Events/add.ctp Executable file → Normal file
View File

0
app/View/Events/contact.ctp Executable file → Normal file
View File

0
app/View/Events/edit.ctp Executable file → Normal file
View File

0
app/View/Events/export.ctp Executable file → Normal file
View File

0
app/View/Events/hids.ctp Executable file → Normal file
View File

0
app/View/Events/index.ctp Executable file → Normal file
View File

0
app/View/Events/nids.ctp Executable file → Normal file
View File

0
app/View/Events/succes.ctp Executable file → Normal file
View File

0
app/View/Events/view.ctp Executable file → Normal file
View File

0
app/View/Events/xml.ctp Executable file → Normal file
View File

0
app/View/Events/xml/add.ctp Executable file → Normal file
View File

0
app/View/Events/xml/view.ctp Executable file → Normal file
View File

0
app/View/Helper/AppHelper.php Executable file → Normal file
View File

0
app/View/Layouts/Emails/html/default.ctp Executable file → Normal file
View File

0
app/View/Layouts/Emails/text/default.ctp Executable file → Normal file
View File

Some files were not shown because too many files have changed in this diff Show More