c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.2.4

Browse Source
This commit is contained in:
Mathieu Lagace
2019-10-19 13:11:42 -04:00
parent 498c80f404
commit 799261a7d5
10 changed files with 233 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/EventController.php
View File

@@ -50,7 +50,14 @@ class EventController extends Controller
$event->is_mandatory = 0;
}
$event->desc = request('desc');
$event->msg = request('msg');
if(\request('msg'))
{
$event->msg = request('msg');
}
else
{
$event->msg = "";
}
$event->date_msg = request('date_msg');
$event->save();

113
app/Http/Controllers/JobController.php
View File

@@ -43,90 +43,22 @@ class JobController extends Controller
{
$job = new Job;
$job->name = request('name');
$job->acces_level = request('acces_level');
$job->desc = request('desc');
if (null !==(request('schedule_see'))) {
$job->schedule_see = request('schedule_see');
} else {
$job->schedule_see = false;
}
if (null !==(request('schedule_edit'))) {
$job->schedule_edit = 1;
} else {
$job->schedule_edit = false;
}
if (null !==(request('schedule_notify'))) {
$job->schedule_notify = 1;
} else {
$job->schedule_notify = false;
}
if (null !==(request('message_see'))) {
$job->message_see = 1;
} else {
$job->message_see = false;
}
if (null !==(request('message_edit'))) {
$job->message_edit = 1;
} else {
$job->message_edit = false;
}
if (null !==(request('message_notify'))) {
$job->message_notify = 1;
} else {
$job->message_notify = false;
}
if (null !==(request('paper_edit'))) {
$job->paper_edit = 1;
} else {
$job->paper_edit = false;
}
if (null !==(request('paper_publish'))) {
$job->paper_publish = 1;
} else {
$job->paper_publish = false;
}
if (null !==(request('paper_notify'))) {
$job->paper_notify = 1;
} else {
$job->paper_notify = false;
}
if (null !==(request('inventory_see'))) {
$job->inventory_see = 1;
} else {
$job->inventory_see = false;
}
if (null !==(request('inventory_edit'))) {
$job->inventory_edit = 1;
} else {
$job->inventory_edit = false;
}
if (null !==(request('inventory_notify'))) {
$job->inventory_notify = 1;
} else {
$job->inventory_notify = false;
}
if (null !==(request('user_see'))) {
$job->user_see = 1;
} else {
$job->user_see = false;
}
if (null !==(request('user_edit'))) {
$job->user_edit = 1;
} else {
$job->user_edit = false;
}
if (null !==(request('user_notify'))) {
$job->user_notify = 1;
} else {
$job->user_notify = false;
$job->name = $request->name;
$job->desc = $request->desc;
$tpermission = [];
foreach (\App\Permission::all() as $perm)
{
$tkey = $perm->ckey;
$tpermission[$tkey] = $request->$tkey;
}
$job->permissions = json_encode($tpermission);
$job->save();
return redirect('/admin/config/job/'.$job->id);
clog('add','success','Poste ajouté avec succès');
return redirect('/admin/config/jobs')->with('success','Poste ajouté avec succès');
}
/**
@@ -162,9 +94,26 @@ class JobController extends Controller
* @param \App\Job $job
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Job $job)
public function update(Request $request, $id)
{
//
$job = Job::find($id);
$job->name = $request->name;
$job->desc = $request->desc;
$tpermission = [];
foreach (\App\Permission::all() as $perm)
{
$tkey = $perm->ckey;
$tpermission[$tkey] = $request->$tkey;
}
$job->permissions = json_encode($tpermission);
$job->save();
clog('add','success','Poste modifié avec succès');
return redirect('/admin/config/jobs')->with('success','Poste modifié avec succès');
}
/**

4
app/Http/Controllers/UserController.php
View File

@@ -70,7 +70,7 @@ class UserController extends Controller
$user->avatar = rand(1,16);
$user->rank_id = request('rank');
$user->job = request('job');
$user->job_id = request('job');
$user->password = bcrypt(request('psw'));
$user->api_token = str_random(60);
@@ -142,7 +142,7 @@ class UserController extends Controller
}
$user->rank_id = request('rank');
$user->job = request('job');
$user->job_id = request('job');
if (request('psw') != null) {
$user->password = bcrypt(request('psw'));
}

2
app/News.php
View File

@@ -32,7 +32,7 @@ class News extends Model
foreach (\App\Event::future() as $event)
{
if($event->type = 1)
if($event->type == 1 && $event->msg != "")
{
if (date('U',strtotime($event->date_msg)) <= time())
{