blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 02:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Message

Browse Source
This commit is contained in:
Paminger
2016-05-10 14:12:33 +02:00
parent 1a36ce3dff
commit e624540c16
10 changed files with 667 additions and 3627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/fhcomplete.php
+3 -1
View File
@@ -10,5 +10,7 @@ $config['fhc_acl'] = array
'public.tbl_prestudent' => 'basis/person',
'public.tbl_prestudentstatus' => 'basis/person',
'public.tbl_organisationseinheit' => 'basis/organisationseinheit',
'public.tbl_sprache' => 'admin'
'public.tbl_sprache' => 'admin',
'public.tbl_msg_thread' => 'admin',
'public.tbl_msg_message' => 'admin'
);
application/config/migration.php
+2 -2
View File
@@ -23,7 +23,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 008;
$config['migration_version'] = 007;
/*
|--------------------------------------------------------------------------
@@ -55,7 +55,7 @@ $config['migration_type'] = 'sequential';
| will migrate up. This must be set.
|
*/
$config['migration_table'] = 'ci_migrations';
$config['migration_table'] = 'system.ci_migrations';
/*
|--------------------------------------------------------------------------
application/controllers/DBTools.php
+2 -1
View File
@@ -48,6 +48,7 @@ class DBTools extends FHC_Controller
if (ENVIRONMENT !== 'development')
exit('Wowsers! You don\'t want to do that!');
$this->load->database('system'); //Use the system-Connection for DB-Manipulation
$this->config->load('migration');
$this->load->library('migration');
// If not set, set it
@@ -301,7 +302,7 @@ class DBTools extends FHC_Controller
*/
private function __getVersion()
{
$row = $this->db->get('ci_migrations')->row();
$row = $this->db->get($this->config->item('migration_table'))->row();
return $row ? $row->version : 0;
}
}
application/controllers/ModelTest.php
+3 -3
View File
@@ -28,7 +28,7 @@ class ModelTest extends FHC_Controller
$res = $this->Person_model->getPerson(null, 'asdf\' OR person_id=1; SELECT 1; --');
var_dump($res->result_object());
$this->load->model('person/Prestudent_model');
$this->load->model('crm/Prestudent_model');
$id=null;
// Insert PreStudent
@@ -79,7 +79,7 @@ class ModelTest extends FHC_Controller
var_dump($res->retval);
// Insert PreStudentStatus
$this->load->model('person/Prestudentstatus_model');
$this->load->model('crm/Prestudentstatus_model');
$data = array
(
'prestudent_id' => $id,
@@ -155,7 +155,7 @@ class ModelTest extends FHC_Controller
else
var_dump($res->retval);
$this->load->model('core/Sprache_model');
$this->load->model('system/Sprache_model');
// Insert Sprache
$data = array
(
application/controllers/message/Message.php → application/controllers/system/Message.php
View File
application/core/FHC_Model.php
+3 -2
View File
@@ -1,5 +1,6 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
if (! defined('BASEPATH'))
exit('No direct script access allowed');
class FHC_Model extends CI_Model
{
@@ -13,7 +14,7 @@ class FHC_Model extends CI_Model
$uid = $this->session->uid;
else
$uid = null;
$this->load->library('FHC_DB_ACL',array('uid' => $uid));
$this->load->library('FHC_DB_ACL', array('uid' => $uid));
}
/** ---------------------------------------------------------------
application/migrations/008_message.php
+40 -38
View File
@@ -6,57 +6,59 @@ class Migration_Message extends CI_Migration {
public function up()
{
if (!$this->db->table_exists('msg_messages'))
if (! $this->db->table_exists('public.tbl_msg_message'))
{
$query= '
CREATE TABLE msg_messages (
id serial,
$query= "
CREATE TABLE public.tbl_msg_message (
message_id serial,
thread_id bigint NOT NULL,
body text NOT NULL,
priority smallint NOT NULL DEFAULT 0,
sender_id bigint NOT NULL,
person_id bigint NOT NULL,
cdate timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id)
PRIMARY KEY (message_id)
);
GRANT SELECT ON TABLE msg_messages TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_messages TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_messages TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE msg_messages_id_seq TO web;
GRANT SELECT, UPDATE ON SEQUENCE msg_messages_id_seq TO admin;
GRANT SELECT, UPDATE ON SEQUENCE msg_messages_id_seq TO vilesci;
COMMENT ON COLUMN public.tbl_msg_message.person_id IS 'Sender';
COMMENT ON COLUMN public.tbl_msg_message.priority IS 'Codex in config/message.php';
GRANT SELECT ON TABLE public.tbl_msg_message TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_message TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_message TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_message_message_id_seq TO web;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_message_message_id_seq TO admin;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_message_message_id_seq TO vilesci;
CREATE TABLE msg_participants (
user_id bigint NOT NULL,
CREATE TABLE public.tbl_msg_participant (
person_id bigint NOT NULL,
thread_id bigint NOT NULL,
cdate timestamp NOT NULL DEFAULT now(),
PRIMARY KEY (user_id,thread_id)
PRIMARY KEY (person_id,thread_id)
);
GRANT SELECT ON TABLE msg_participants TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_participants TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_participants TO vilesci;
GRANT SELECT ON TABLE public.tbl_msg_participant TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_participant TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_participant TO vilesci;
CREATE TABLE msg_status (
CREATE TABLE public.tbl_msg_status (
message_id bigint NOT NULL,
user_id bigint NOT NULL,
person_id bigint NOT NULL,
status smallint NOT NULL,
PRIMARY KEY (message_id,user_id)
PRIMARY KEY (message_id,person_id)
);
GRANT SELECT ON TABLE msg_status TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_status TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_status TO vilesci;
GRANT SELECT ON TABLE public.tbl_msg_status TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_status TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_status TO vilesci;
CREATE TABLE msg_threads (
id serial,
CREATE TABLE public.tbl_msg_thread (
thread_id serial,
subject text,
PRIMARY KEY (id)
PRIMARY KEY (thread_id)
);
GRANT SELECT ON TABLE msg_threads TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_threads TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE msg_threads TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE msg_threads_id_seq TO web;
GRANT SELECT, UPDATE ON SEQUENCE msg_threads_id_seq TO admin;
GRANT SELECT, UPDATE ON SEQUENCE msg_threads_id_seq TO vilesci;
';
GRANT SELECT ON TABLE public.tbl_msg_thread TO web;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_thread TO admin;
GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_thread TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_thread_thread_id_seq TO web;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_thread_thread_id_seq TO admin;
GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_thread_thread_id_seq TO vilesci;
";
if (!$this->db->simple_query($query))
{
echo "Error creating Basis DB-Schema!";
@@ -66,10 +68,10 @@ class Migration_Message extends CI_Migration {
public function down()
{
$this->dbforge->drop_table('msg_messages');
$this->dbforge->drop_table('msg_participants');
$this->dbforge->drop_table('msg_status');
$this->dbforge->drop_table('msg_threads');
$this->dbforge->drop_table('public.tbl_msg_message');
$this->dbforge->drop_table('public.tbl_msg_participant');
$this->dbforge->drop_table('public.tbl_msg_status');
$this->dbforge->drop_table('public.tbl_msg_thread');
}
}
application/models/system/Message_model.php
+599 -3579
View File
File diff suppressed because it is too large Load Diff
application/models/system/Thread_model.php
+14
View File
@@ -0,0 +1,14 @@
<?php
class Thread_model extends DB_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->dbTable = 'public.tbl_msg_thread';
$this->pk = 'thread_id';
}
}
include/studiengang.class.php
+1 -1
View File
@@ -31,7 +31,7 @@ if (function_exists('get_instance'))
else
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/lehre/Studiengang_model.php');
require_once(dirname(__FILE__).'/../application/models/organisation/Studiengang_model.php');
class studiengang extends Studiengang_model
{