Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

application/config/autoload.php

@@ -99,7 +99,7 @@ $autoload['helper'] = array('url');
 | config files.  Otherwise, leave it blank.
 |
 */
-$autoload['config'] = array();
+$autoload['config'] = array('fhcomplete');
 
 /*
 | -------------------------------------------------------------------

application/config/config.php

@@ -29,7 +29,7 @@ $config['base_url'] = 'http://localhost/fhcomplete/';
 | variable so that it is blank.
 |
 */
-$config['index_page'] = 'index.php';
+$config['index_page'] = 'index.ci.php';
 
 /*
 |--------------------------------------------------------------------------

application/config/fhcomplete.php

@@ -0,0 +1,8 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['fhc_version'] = '3.2';
+
+
+// status return message codes
+define('FHC_SUCCESS', 0);
+define('FHC_ERR_GENERAL', 1);

application/config/grocery_crud.php

@@ -1,6 +1,6 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 	//For view all the languages go to the folder assets/grocery_crud/languages/
-	$config['grocery_crud_default_language']	= 'en_US';
+	$config['grocery_crud_default_language']	= 'english';
 
 	// There are only three choices: "uk-date" (dd/mm/yyyy), "us-date" (mm/dd/yyyy) or "sql-date" (yyyy-mm-dd)
 	$config['grocery_crud_date_format']			= 'uk-date';

application/config/message.php

@@ -0,0 +1,35 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+// application's Users table - define your user table and columns here
+
+define('USER_TABLE_TABLENAME', 'tbl_person p');
+define('USER_TABLE_ID', 'p.person_id');
+define('USER_TABLE_USERNAME', "CONCAT(p.vorname, ' ', p.nachname) as user_name");
+
+
+// message statuses
+define('MSG_STATUS_UNREAD', 0);
+define('MSG_STATUS_READ', 1);
+define('MSG_STATUS_ARCHIVED', 2);
+
+// priority
+define('PRIORITY_LOW', 1);
+define('PRIORITY_NORMAL', 2);
+define('PRIORITY_HIGH', 3);
+define('PRIORITY_URGENT', 4);
+
+// status return message codes
+define('MSG_SUCCESS', 0);
+define('MSG_ERR_GENERAL', 1);
+define('MSG_ERR_INVALID_USER_ID', 2);
+define('MSG_ERR_INVALID_MSG_ID', 3);
+define('MSG_ERR_INVALID_THREAD_ID', 4);
+define('MSG_ERR_INVALID_STATUS_ID', 5);
+define('MSG_ERR_INVALID_SENDER_ID', 6);
+define('MSG_ERR_INVALID_RECIPIENTS', 7);
+define('MSG_MESSAGE_SENT', 8);
+define('MSG_STATUS_UPDATE', 9);
+define('MSG_PARTICIPANT_ADDED', 10);
+define('MSG_ERR_PARTICIPANT_EXISTS', 11);
+define('MSG_ERR_PARTICIPANT_NONSYSTEM', 12);
+define('MSG_PARTICIPANT_REMOVED', 13);

application/config/migration.php

@@ -23,7 +23,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 20160101010103;
+$config['migration_version'] = 008;
 
 /*
 |--------------------------------------------------------------------------
@@ -41,7 +41,7 @@ $config['migration_version'] = 20160101010103;
 |       defaults to 'sequential' for backward compatibility with CI2.
 |
 */
-$config['migration_type'] = 'timestamp';
+$config['migration_type'] = 'sequential';
 
 /*
 |--------------------------------------------------------------------------