Skip to content

Hyphen to underscore #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2016
Merged

Hyphen to underscore #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb0a61
Merge pull request #1 from dereuromark/master
AdamHyski Aug 27, 2016
0b5a9c8
change hyphen to underscore auth_allow
AdamHyski Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ A CakePHP 3.x plugin to handle authentication and user authorization the easy wa
## Demo
See http://sandbox3.dereuromark.de/auth-sandbox

### auth-allow.ini
### auth_allow.ini
```ini
Users = index,view
PluginName.SomeController = *
Expand Down
0 config/auth-allow.default.ini → config/auth_allow.default.ini
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions docs/Authentication.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ public function initialize() {
}
```

## auth-allow.ini
## auth_allow.ini

TinyAuth expects an ``auth-allow.ini`` file in your config directory.
TinyAuth expects an ``auth_allow.ini`` file in your config directory.
Use it to specify what actions are not protected by authentication.

The section key syntax follows the CakePHP naming convention for plugins.
Expand Down Expand Up @@ -87,7 +87,6 @@ Option | Type | Description
:----- | :--- | :----------
autoClearCache|bool|True will generate a new ACL cache file every time.
filePath|string|Full path to the acl.ini. Defaults to `ROOT . DS . 'config' . DS`.
file|string|Name of the INI file. Defaults to `auth-allow.ini`.
file|string|Name of the INI file. Defaults to `auth_allow.ini`.
cache|string|Cache type. Defaults to `_cake_core_`.
cacheKey|string|Cache key. Defaults to `tiny_auth_allow`.

2 changes: 1 addition & 1 deletion src/Controller/Component/AuthComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AuthComponent extends CakeAuthComponent {
'cacheKey' => 'tiny_auth_allow',
'autoClearCache' => false, // Set to true to delete cache automatically in debug mode
'filePath' => null, // Possible to locate ini file at given path e.g. Plugin::configPath('Admin')
'file' => 'auth-allow.ini',
'file' => 'auth_allow.ini',
];

/**
Expand Down