code-igniter-v3-giggi: update release v2
diff --git a/application/config/autoload.php b/application/config/autoload.php
index 7cdc901..c730abd 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -58,7 +58,7 @@
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
-$autoload['libraries'] = array();
+$autoload['libraries'] = array('database', 'session', 'form_validation');
/*
| -------------------------------------------------------------------
@@ -89,7 +89,7 @@
|
| $autoload['helper'] = array('url', 'file');
*/
-$autoload['helper'] = array();
+$autoload['helper'] = array('form', 'url');
/*
| -------------------------------------------------------------------
diff --git a/application/config/config.php b/application/config/config.php
index 5e82e23..a028c9d 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -23,7 +23,8 @@
| a PHP script and you can easily do that on your own.
|
*/
-$config['base_url'] = 'https://www.giggi.me/';
+$__host_name = getenv('HOST_NAME');
+$config['base_url'] = 'https://' . $__host_name . '/';
/*
|--------------------------------------------------------------------------
@@ -377,13 +378,13 @@
| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
|
*/
-$config['sess_driver'] = 'files';
+$config['sess_driver'] = 'database';
$config['sess_cookie_name'] = 'ci_session';
$config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
+$config['sess_save_path'] = 'sessions';
$config['sess_match_ip'] = FALSE;
$config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = TRUE;
/*
|--------------------------------------------------------------------------
@@ -403,8 +404,8 @@
$config['cookie_prefix'] = '';
$config['cookie_domain'] = '';
$config['cookie_path'] = '/';
-$config['cookie_secure'] = FALSE;
-$config['cookie_httponly'] = FALSE;
+$config['cookie_secure'] = TRUE;
+$config['cookie_httponly'] = TRUE;
/*
|--------------------------------------------------------------------------
diff --git a/application/config/database.php b/application/config/database.php
index 01eb5b4..eda78bb 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -82,13 +82,19 @@
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,
- 'db_debug' => TRUE,
+ 'db_debug' => FALSE,
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'swap_pre' => '',
- 'encrypt' => TRUE,
+ 'encrypt' => [
+ 'ssl_capath' => getenv('MYSQL_SSL_CAPATH'),
+ 'ssl_cert' => getenv('MYSQL_SSL_CERT'),
+ 'ssl_key' => getenv('MYSQL_SSL_KEY'),
+ 'ssl_ca' => getenv('MYSQL_SSL_CA'),
+ 'ssl_verify' => FALSE
+ ],
'compress' => FALSE,
'stricton' => FALSE,
'failover' => array(),
@@ -97,10 +103,10 @@
$db['default'] = array(
'dsn' => '',
- 'hostname' => 'localhost',
- 'username' => '',
- 'password' => '',
- 'database' => '',
+ 'hostname' => getenv('MYSQL_HOSTNAME'),
+ 'username' => getenv('MYSQL_USER'),
+ 'password' => getenv('MYSQL_PASSWORD'),
+ 'database' => getenv('MYSQL_DATABASE'),
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,
@@ -110,7 +116,13 @@
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'swap_pre' => '',
- 'encrypt' => FALSE,
+ 'encrypt' => [
+ 'ssl_capath' => getenv('MYSQL_SSL_CAPATH'),
+ 'ssl_cert' => getenv('MYSQL_SSL_CERT'),
+ 'ssl_key' => getenv('MYSQL_SSL_KEY'),
+ 'ssl_ca' => getenv('MYSQL_SSL_CA'),
+ 'ssl_verify' => FALSE
+ ],
'compress' => FALSE,
'stricton' => FALSE,
'failover' => array(),
diff --git a/application/config/routes.php b/application/config/routes.php
index ec2e36c..5aadce0 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -49,41 +49,28 @@
| Examples: my-controller/index -> my_controller/index
| my-controller/my-method -> my_controller/my_method
*/
-/* Requested URI is empty - https://www.giggi.me */
-$route['default_controller'] = 'pelican/index';
+/* Requested URI is empty */
+$route['default_controller'] = 'pelican/public_root';
-/* Requested URI is 'about' - https://www.giggi.me/about */
-$route['(^about$|page/about)'] = 'pelican/view/about';
+$route['^archive$'] = 'pelican/public_root/archives';
+$route['^(author|a)$'] = 'pelican/public_root/authors';
+$route['^(blog|b)$'] = 'pelican/public_root/blog';
+$route['^(category|c)$'] = 'pelican/public_root/categories';
+$route['^gitles$'] = 'pelican/public_gitles';
+$route['^(home|h)$'] = 'pelican/public_root/index';
+$route['^(/|index|i)$'] = 'pelican/public_root/index';
+$route['^(tag|t)$'] = 'pelican/public_root/tags';
-/* Requested URI is 'blog' - https://www.giggi.me/blog */
-$route['^blog$'] = 'pelican/view/blog';
+$route['^(author|a)/(.+)'] = 'pelican/public_author/$2';
+$route['(blog|b)/(.+)'] = 'pelican/public_blog/$2';
+$route['^(category|c)/(.+)'] = 'pelican/public_category/$2';
+$route['^(draft|d)/(.+)'] = 'pelican/public_draft/$2';
-/* Requested URI is 'blog' - https://www.giggi.me/blog/foo.html */
-$route['^blog/(.+)'] = 'pelican/view/$1';
-
-/* Requested URI is 'category' - https://www.giggi.me/category/bar.html */
-$route['^category/(.+)'] = 'pelican/view/$1';
-
-/* Requested URI is 'ftp' - https://www.giggi.me/ftp */
-$route['(^ftp$|page/ftp)'] = 'pelican/view/ftp';
-
-/* Requested URI is 'git' - https://www.giggi.me/gerrit */
-$route['gerrit'] = 'pelican/view/index';
-
-/* Requested URI is 'git' - https://www.giggi.me/git */
-$route['(^git$|page/git)'] = 'pelican/view/git';
-
-/* Requested URI is 'home' - https://www.giggi.me/home */
-$route['home'] = 'pelican/index';
-
-/* Requested URI is 'invite' - https://www.giggi.me/invite */
+$route['(^about$|page/about)'] = 'pelican/public_page/about';
+$route['(^ftp$|page/ftp)'] = 'pelican/public_page/ftp';
+$route['(^git$|page/git)'] = 'pelican/public_page/git';
$route['(^invite$|page/invite)'] = 'invite/view/invite';
-
-/* Requested URI is 'login' - https://www.giggi.me/login */
-$route['(^login$|page/login)'] = 'login/view/login';
-
-/* Requested URI is 'mail' - https://www.giggi.me/mail */
-$route['(^mail$|page/mail)'] = 'pelican/view/mail';
+$route['(^mail$|page/mail)'] = 'pelican/public_page/mail';
$route['404_override'] = '';
$route['translate_uri_dashes'] = FALSE;