Skip to content

Commit 96bf165

Browse files
lonnieezelllonnieezell
committed
Merging latest develop
2 parents 1c085b2 + f1bdc19 commit 96bf165

453 files changed

Lines changed: 20735 additions & 10976 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ writable/uploads/*
6363

6464
writable/debugbar/*
6565

66+
application/Database/Migrations/2*
67+
68+
php_errors.log
69+
6670
#-------------------------
6771
# User Guide Temp Files
6872
#-------------------------
@@ -122,3 +126,4 @@ nb-configuration.xml
122126
.vscode/
123127

124128
/results/
129+
/phpunit*.xml

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ php:
88
matrix:
99
fast_finish: true
1010
allow_failures:
11-
- php: 7.2
1211
- php: nightly
1312

1413
global:
@@ -44,4 +43,4 @@ before_script:
4443
- composer install --prefer-source
4544

4645
after_success:
47-
- travis_retry php tests/bin/coveralls.phar
46+
- travis_retry php tests/bin/php-coveralls.phar -v

‎application/Config/App.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class App extends BaseConfig
215215
| Reverse Proxy IPs
216216
|--------------------------------------------------------------------------
217217
|
218-
| If your getServer is behind a reverse proxy, you must whitelist the proxy
218+
| If your server is behind a reverse proxy, you must whitelist the proxy
219219
| IP addresses from which CodeIgniter should trust headers such as
220220
| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
221221
| the visitor's IP address.
@@ -240,11 +240,13 @@ class App extends BaseConfig
240240
| CSRFCookieName = The cookie name
241241
| CSRFExpire = The number in seconds the token should expire.
242242
| CSRFRegenerate = Regenerate token on every submission
243+
| CSRFRedirect = Redirect to previous page with error on failure
243244
*/
244245
public $CSRFTokenName = 'csrf_test_name';
245246
public $CSRFCookieName = 'csrf_cookie_name';
246247
public $CSRFExpire = 7200;
247248
public $CSRFRegenerate = true;
249+
public $CSRFRedirect = true;
248250

249251
/*
250252
|--------------------------------------------------------------------------
@@ -270,6 +272,9 @@ class App extends BaseConfig
270272
| and state of your application during that page display. By default it will
271273
| NOT be displayed under production environments, and will only display if
272274
| CI_DEBUG is true, since if it's not, there's not much to display anyway.
275+
|
276+
| toolbarMaxHistory = Number of history files, 0 for none or -1 for unlimited
277+
|
273278
*/
274279
public $toolbarCollectors = [
275280
'CodeIgniter\Debug\Toolbar\Collectors\Timers',
@@ -281,6 +286,7 @@ class App extends BaseConfig
281286
'CodeIgniter\Debug\Toolbar\Collectors\Routes',
282287
'CodeIgniter\Debug\Toolbar\Collectors\Events',
283288
];
289+
public $toolbarMaxHistory = 20;
284290

285291
/*
286292
|--------------------------------------------------------------------------

‎application/Config/Autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Config;
22

3-
require BASEPATH.'Config/AutoloadConfig.php';
3+
require_once BASEPATH.'Config/AutoloadConfig.php';
44

55
/**
66
* -------------------------------------------------------------------

‎application/Config/Cache.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Cache extends BaseConfig
3636
| system.
3737
|
3838
*/
39-
public $path = WRITEPATH.'cache/';
39+
public $storePath = WRITEPATH.'cache/';
4040

4141
/*
4242
|--------------------------------------------------------------------------

‎application/Config/ContentSecurityPolicy.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ContentSecurityPolicy extends BaseConfig
2323

2424
public $imageSrc = 'self';
2525

26-
public $base_uri = null;
26+
public $baseURI = 'none';
2727

2828
public $childSrc = null;
2929

@@ -38,6 +38,8 @@ class ContentSecurityPolicy extends BaseConfig
3838
public $mediaSrc = null;
3939

4040
public $objectSrc = null;
41+
42+
public $manifestSrc = null;
4143

4244
public $pluginTypes = null;
4345

‎application/Config/DocTypes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class DocTypes
1010
{
11-
static $list =
11+
public $list =
1212
[
1313
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
1414
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',

‎application/Config/Email.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
class Email
44
{
5+
/**
6+
* @var string
7+
*/
8+
public $fromEmail;
9+
10+
/**
11+
* @var string
12+
*/
13+
public $fromName;
14+
515
/**
616
* The "user agent"
717
* @var string

‎application/Config/Filters.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@ class Filters extends BaseConfig
99
public $aliases = [
1010
'csrf' => \App\Filters\CSRF::class,
1111
'toolbar' => \App\Filters\DebugToolbar::class,
12+
'honeypot' => \App\Filters\Honeypot::class
1213
];
1314

1415
// Always applied before every request
1516
public $globals = [
1617
'before' => [
17-
// 'csrf'
18+
//'honeypot'
19+
// 'csrf',
1820
],
1921
'after' => [
20-
'toolbar'
22+
'toolbar',
23+
//'honeypot'
2124
]
2225
];
2326

‎application/Config/Honeypot.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php namespace Config;
2+
3+
use CodeIgniter\Config\BaseConfig;
4+
5+
class Honeypot extends BaseConfig
6+
{
7+
8+
/**
9+
* Makes Honeypot visible or not to human
10+
*
11+
* @var boolean
12+
*/
13+
public $hidden = true;
14+
/**
15+
* Honeypot Label Content
16+
* @var String
17+
*/
18+
public $label = 'Fill This Field';
19+
20+
/**
21+
* Honeypot Field Name
22+
* @var String
23+
*/
24+
public $name = 'honeypot';
25+
26+
/**
27+
* Honeypot HTML Template
28+
* @var String
29+
*/
30+
public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
31+
}

0 commit comments

Comments
 (0)