Skip to content

Commit 8196f8c

Browse files
bangbangdabangbangda
authored
Merge pull request #2 from bcit-ci/develop
Update code
2 parents de7d9e1 + 6da7103 commit 8196f8c

111 files changed

Lines changed: 5072 additions & 4050 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ nb-configuration.xml
126126
.vscode/
127127

128128
/results/
129-
/phpunit.xml
129+
/phpunit*.xml

‎application/Config/App.php‎

Lines changed: 3 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
|--------------------------------------------------------------------------

‎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">',

0 commit comments

Comments
 (0)