17 files changed, 62 insertions, 12 deletions
diff --git a/application/config/.gitignore b/application/config/.gitignore
new file mode 100644
index 000000000..cde8069e1
--- /dev/null
+++ b/application/config/.gitignore
@@ -0,0 +1 @@
+*.php
diff --git a/application/config/example/.gitignore b/application/config/example/.gitignore
new file mode 100644
index 000000000..f9be8dfe0
--- /dev/null
+++ b/application/config/example/.gitignore
@@ -0,0 +1 @@
+!*
diff --git a/application/config/autoload.php b/application/config/example/autoload.php
index 53129c9c6..a471f3ab2 100644..100755
--- a/application/config/autoload.php
+++ b/application/config/example/autoload.php
@@ -52,7 +52,7 @@ $autoload['packages'] = array();
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array();
+$autoload['libraries'] = array('database');
 
 
 /*
@@ -64,7 +64,7 @@ $autoload['libraries'] = array();
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array();
+$autoload['helper'] = array('url');
 
 
 /*
diff --git a/application/config/config.php b/application/config/example/config.php
index 1ec65435e..bcd71a5ce 100644..100755
--- a/application/config/config.php
+++ b/application/config/example/config.php
@@ -357,6 +357,31 @@ $config['rewrite_short_tags'] = FALSE;
 */
 $config['proxy_ips'] = '';
 
+/*
+|--------------------------------------------------------------------------
+| Filebin
+|-------------------------------------------------------------------------
+|
+| upload_path should NOT be readable/served by the server, but only by 
+|   the script
+| sizes are in bytes
+| max_age in seconds
+|
+ */
+
+$config['upload_path'] = FCPATH.'data/uploads';
+$config['upload_max_size'] = 256*1024*1024;
+$config['upload_max_text_size'] = 2*1024*1024;
+
+// 0 disables deletion
+$config['upload_max_age'] = 60*60*24*5; // 5 days
+
+// won't be deleted
+$config['small_upload_size'] = 1024*10; // 10KB
+
+$config['passwordsalt'] = ''; // just enter any string you want here
+
+$config['contact_me_url'] = ''; // ommiting this will remove the "contact me" line.
 
 /* End of file config.php */
 /* Location: ./application/config/config.php */
diff --git a/application/config/constants.php b/application/config/example/constants.php
index 4a879d360..1185dbca0 100644..100755
--- a/application/config/constants.php
+++ b/application/config/example/constants.php
@@ -1,5 +1,7 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
+putenv('HOME='.FCPATH);
+
 /*
 |--------------------------------------------------------------------------
 | File and Directory Modes
diff --git a/application/config/database.php b/application/config/example/database.php
index b4b34bf66..51b666b38 100644..100755
--- a/application/config/database.php
+++ b/application/config/example/database.php
@@ -48,18 +48,18 @@
 $active_group = 'default';
 $active_record = TRUE;
 
-$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = '';
-$db['default']['password'] = '';
-$db['default']['database'] = '';
-$db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = '';
+$db['default']['hostname'] = "localhost";
+$db['default']['username'] = "";
+$db['default']['password'] = "";
+$db['default']['database'] = "";
+$db['default']['dbdriver'] = "mysqli";
+$db['default']['dbprefix'] = "";
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-$db['default']['char_set'] = 'utf8';
-$db['default']['dbcollat'] = 'utf8_general_ci';
+$db['default']['cachedir'] = "";
+$db['default']['char_set'] = "utf8";
+$db['default']['dbcollat'] = "utf8_bin";
 $db['default']['swap_pre'] = '';
 $db['default']['autoinit'] = TRUE;
 $db['default']['stricton'] = FALSE;
diff --git a/application/config/doctypes.php b/application/config/example/doctypes.php
index f7e1d19a2..f7e1d19a2 100644..100755
--- a/application/config/doctypes.php
+++ b/application/config/example/doctypes.php
diff --git a/application/config/foreign_chars.php b/application/config/example/foreign_chars.php
index 14b0d7373..14b0d7373 100644..100755
--- a/application/config/foreign_chars.php
+++ b/application/config/example/foreign_chars.php
diff --git a/application/config/hooks.php b/application/config/example/hooks.php
index a4ad2be6d..a4ad2be6d 100644..100755
--- a/application/config/hooks.php
+++ b/application/config/example/hooks.php
diff --git a/application/config/example/index.html b/application/config/example/index.html
new file mode 100755
index 000000000..c942a79ce
--- /dev/null
+++ b/application/config/example/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/application/config/example/memcache.php b/application/config/example/memcache.php
new file mode 100644
index 000000000..a5bc7e3a8
--- /dev/null
+++ b/application/config/example/memcache.php
@@ -0,0 +1,9 @@
+<?php
+
+// this file is a config example for the codeigniter-memcache library
+// add this file to the your application's config directory
+$config["MEMCACHE_HOST"] = '127.0.0.1';
+$config["MEMCACHE_PORT"]   = 11211;
+
+
+?>
diff --git a/application/config/mimes.php b/application/config/example/mimes.php
index f00e5b6ed..f00e5b6ed 100644..100755
--- a/application/config/mimes.php
+++ b/application/config/example/mimes.php
diff --git a/application/config/profiler.php b/application/config/example/profiler.php
index f8a5b1a1e..f8a5b1a1e 100644..100755
--- a/application/config/profiler.php
+++ b/application/config/example/profiler.php
diff --git a/application/config/routes.php b/application/config/example/routes.php
index 5f9a58343..2697c6b11 100644..100755
--- a/application/config/routes.php
+++ b/application/config/example/routes.php
@@ -38,7 +38,9 @@
 |
 */
 
-$route['default_controller'] = "welcome";
+$route['default_controller'] = "file";
+$route['file/(:any)'] = "file/$1";
+$route['(:any)'] = "file/index/$1";
 $route['404_override'] = '';
 
 
diff --git a/application/config/smileys.php b/application/config/example/smileys.php
index 25d28b2c4..25d28b2c4 100644..100755
--- a/application/config/smileys.php
+++ b/application/config/example/smileys.php
diff --git a/application/config/user_agents.php b/application/config/example/user_agents.php
index e2d3c3af0..e2d3c3af0 100644..100755
--- a/application/config/user_agents.php
+++ b/application/config/example/user_agents.php
diff --git a/application/config/index.html b/application/config/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/application/config/index.html
+++ b/application/config/index.html