Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
add room model tests
  • Loading branch information
msquare committed May 14, 2015
1 parent 284ed12 commit 0a59089
Show file tree
Hide file tree
Showing 10 changed files with 127 additions and 414 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -5,3 +5,4 @@
_vimrc_local.vim
.sass-cache
config/config.php
test/coverage
355 changes: 0 additions & 355 deletions includes/controller/api.php

This file was deleted.

3 changes: 0 additions & 3 deletions includes/engelsystem_provider.php
Expand Up @@ -71,9 +71,6 @@

require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php');

session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
session_start();

gettext_init();

sql_connect($config['host'], $config['user'], $config['pw'], $config['db']);
Expand Down
2 changes: 1 addition & 1 deletion includes/helper/session_helper.php
Expand Up @@ -22,7 +22,7 @@ function session_lifetime($lifetime, $application_name) {
ini_set('session.gc_divisor', 100);

// Cookie settings (lifetime)
ini_set('session.cookie_secure', ! (preg_match("/^localhost/", $_SERVER["HTTP_HOST"]) || isset($_GET['debug'])));
ini_set('session.cookie_secure', ! (isset($_SERVER['HTTP_HOST']) && preg_match("/^localhost/", $_SERVER["HTTP_HOST"]) || isset($_GET['debug'])));
ini_set('session.use_only_cookies', true);
ini_set('session.cookie_lifetime', $lifetime * 60);
}
Expand Down

0 comments on commit 0a59089

Please sign in to comment.