File systeme V3

app/Http/Controllers/AdminController.php

@@ -78,9 +78,4 @@ class AdminController extends Controller
         return view('admin.status.index',['alerts' => $alerts]);
     }
 
-    public function instruction()
-    {
-
-    }
-
 }

app/Http/Controllers/ConfigController.php

@@ -140,43 +140,9 @@ class ConfigController extends Controller
 
     public function editfilesConfig()
     {
-        $configList = [
-            'cadet_list',
-        ];
-
-        $configListEncrypt = [
-            'GOOGLE_DRIVE_CLIENT_ID',
-            'GOOGLE_DRIVE_CLIENT_SECRET',
-            'GOOGLE_DRIVE_REFRESH_TOKEN',
-            'GOOGLE_DRIVE_FOLDER_ID'
-        ];
-
-        if (\request('is_active') == 'on')
+        if (\request()->file('nominativeList') != null)
         {
-            $config = \App\Config::find('is_Google_Drive_enabled');
-            $config->data = ['true'];
-            $config->save();
-        }
-        else
-        {
-            $config = \App\Config::find('is_Google_Drive_enabled');
-            $config->data = ['false'];
-            $config->save();
-        }
-
-
-        foreach ($configList as $configName)
-        {
-            $config = \App\Config::find($configName);
-            $config->data = [\request($configName)];
-            $config->save();
-        }
-
-        foreach ($configListEncrypt as $configName)
-        {
-            $config = \App\Config::find($configName);
-            $config->data = [\Crypt::encryptString(\request($configName))];
-            $config->save();
+            \Storage::putFileAs('Systeme/Fichier',\request()->file('nominativeList'),'ListeNominative.pdf');
         }
 
         clog('edit','success','a modifié la configuration des fichiers');

app/Http/Controllers/CourseController.php

@@ -71,7 +71,7 @@ class CourseController extends Controller
         {
             $name = $user->fullname();
         }
-        return view('admin.course.show',['course' => $course,'username' => $name,'lessonPlanDir' => \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.PlanDeCours')->id]);
+        return view('admin.course.show',['course' => $course,'username' => $name]);
     }
 
     /**
@@ -136,31 +136,21 @@ class CourseController extends Controller
     public function updateLessonPlan(Request $request, $id)
     {
         $course = Course::findOrFail($id);
-        $name = $course->ocom.'_'.$course->instructor().'_'.$course->event->date_begin.'_'.'v'.date('c').'.'.\request()->file('file')->getClientOriginalExtension();
-        $name = urlencode($name);
-        $dirID = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.PlanDeCours')->id;
+        $name = $course->ocom.'_'.$course->instructor().'_'.date('c',strtotime($course->event->date_begin)).'.'.\request()->file('file')->getClientOriginalExtension();
+        $dirID = 'Systeme/Fichier/PlanDeCours';
 
         if ($course->lessonPlan != null)
         {
             $lessonPlan = $course->lessonPlan;
-            $contents = collect(\Storage::cloud()->listContents($dirID, false));
-
-            $file = $contents
-                ->where('type', '=', 'file')
-                ->where('filename', '=', pathinfo($course->lessonPlan->file, PATHINFO_FILENAME))
-                ->where('extension', '=', pathinfo($course->lessonPlan->file, PATHINFO_EXTENSION))
-                ->first(); // there can be duplicate file names!
-            \Storage::cloud()->delete($file['path']);
         }
         else
         {
             $lessonPlan = new \App\LessonPlan();
         }
-        \Storage::cloud()->putFileAs($dirID,\request()->file('file'),$name);
-        $metadata = \Storage::cloud()->getMetadata($dirID.'/'.$name);
+        \Storage::putFileAs($dirID,\request()->file('file'),$name);
 
         $lessonPlan->user_id = \Auth::user()->id;
-        $lessonPlan->file = $metadata['name'];
+        $lessonPlan->file = $name;
         $lessonPlan->course_id = $course->id;
         $lessonPlan->desc = "";
         $lessonPlan->comment = "";
@@ -169,6 +159,18 @@ class CourseController extends Controller
         return redirect()->back();
     }
 
+    public function downloadLessonPlan($name)
+    {
+        if (\Storage::exists('Systeme/Fichier/PlanDeCours/'.$name))
+        {
+            return \Storage::download('Systeme/Fichier/PlanDeCours/'.$name);
+        }
+        else
+        {
+            abort(404);
+        }
+    }
+
     /**
      * Remove the specified resource from storage.
      *

app/Http/Controllers/FilesController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\GoogleDriveFile;
 use Illuminate\Http\Request;
+use function Symfony\Component\VarDumper\Dumper\esc;
 
 class FilesController extends Controller
 {
@@ -41,21 +42,83 @@ class FilesController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  string  $id
-     * @return void
+     * @param $path
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
-    public function show($path)
+    public function show(String $path)
     {
-        $file_rules = \DB::table('acl_rules')->where('path','=',$path)->get()->all();
-        if ($file_rules != []) {
-            dd($file_rules);
-        }
-        dd(dirname($path));
-        $path_rules = \DB::table('acl_rules')->where('path','=',dirname($path))->get()->all();
-        if ($path_rules != []) {
+        $all_rules = collect(\DB::table('acl_rules')->get()->all());
 
+        foreach ($all_rules as $rule)
+        {
+            if ($rule->path == "*")
+            {
+                if (\Auth::check())
+                {
+                    if (\Auth::user()->checkACLRules($rule) > 0)
+                    {
+                        if (\Storage::exists($path))
+                        {
+                            return \Storage::download($path);
+                        }
+                        else
+                        {
+                            abort(404);
+                        }
+                    }
+                }
+            }
         }
-        return abort(404);
+
+        $path_array = explode('/',$path);
+        $checkedPath = $path_array[0];
+        unset($path_array[0]);
+        $path_array = array_values($path_array);
+
+        while ($checkedPath != $path)
+        {
+            $rules = $all_rules->where('path','=',$checkedPath.'/*');
+            if ($rules->isNotEmpty())
+            {
+                $access_level = 0;
+                foreach ($rules as $r)
+                {
+                    if (\Auth::check())
+                    {
+                        $temp_access_level = \Auth::user()->checkACLRules($r);
+                        if ($temp_access_level > $access_level)
+                        {
+                            $access_level = $temp_access_level;
+                        }
+                    }
+                    else
+                    {
+                        if ($r->user_id == '*')
+                        {
+                            if ($r->access > $access_level)
+                            {
+                                $access_level = $r->access;
+                            }
+                        }
+                    }
+                    if ($access_level > 0)
+                    {
+                        if (\Storage::exists($path))
+                        {
+                            return \Storage::download($path);
+                        }
+                        else
+                        {
+                            abort(404);
+                        }
+                    }
+                }
+            }
+            $checkedPath = $checkedPath.'/'.$path_array[0];
+            unset($path_array[0]);
+            $path_array = array_values($path_array);
+        }
+        abort(403);
     }
 
     /**
@@ -94,67 +157,63 @@ class FilesController extends Controller
 
     public function guide()
     {
-        if (\App\GoogleDriveFile::checkConfig())
-        {
-            $dirID = \App\GoogleDriveFile::findByPath('.Privé/.Staff/.Guide');
-            $dir = collect(\Storage::cloud()->listContents($dirID->id,false))->sortBy('name');
-            return view('admin.files.guide',['dir' => $dir]);
-        }
-        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        return redirect('/admin/files?leftPath=Prive/Staff/Guide');
     }
 
     public function instruction()
     {
-        if (\App\GoogleDriveFile::checkConfig())
-        {
-            return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff/.Instruction')->first()->id, 'mode' => 'folder']);
-        }
-        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
-
+        return redirect('/admin/files?leftPath=Prive/Staff/Instruction');
     }
 
     public function cadet()
     {
-        if (!\App\GoogleDriveFile::checkConfig())
-        {
-            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
-        }
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Cadet')->first()->id, 'mode' => 'folder']);
+        return redirect('/admin/files?leftPath=Prive/Cadet');
     }
 
     public function staff()
     {
-        if (!\App\GoogleDriveFile::checkConfig())
-        {
-            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
-        }
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff')->first()->id, 'mode' => 'folder']);
+        return redirect('/admin/files?leftPath=Prive/Staff');
     }
 
     public function etamas()
     {
-        if (!\App\GoogleDriveFile::checkConfig())
-        {
-            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
-        }
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.ETAMAS')->first()->id, 'mode' => 'folder']);
+        return redirect('/admin/files?leftPath=Prive/ETAMAS');
     }
 
     public function officier()
     {
-        if (!\App\GoogleDriveFile::checkConfig())
-        {
-            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
-        }
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Officier')->first()->id, 'mode' => 'folder']);
+        return redirect('/admin/files?leftPath=Prive/Officier');
     }
 
     public function publique()
     {
-        if (!\App\GoogleDriveFile::checkConfig())
+        return redirect('/admin/files?leftPath=Publique');
+    }
+
+    public function show_nominativeList()
+    {
+        return view('admin.files.list.index');
+    }
+
+    public function download_nominativeList()
+    {
+        if (\Storage::exists('/Systeme/Fichier/ListeNominative.pdf'))
         {
-            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+            return \Storage::download('/Systeme/Fichier/ListeNominative.pdf');
         }
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Publique')->first()->id, 'mode' => 'folder']);
+        return view('admin.files.list.index');
+    }
+
+    public function edit_nominativeList()
+    {
+        return view('admin.files.list.edit');
+    }
+
+    public function update_nominativeList()
+    {
+        \Storage::putFileAs('Systeme/Fichier',\request()->file('nominativeList'),'ListeNominative.pdf');
+
+        clog('edit','success','a modifié la liste nominative');
+        return redirect('/admin/nominativelist')->with('success','Modification sauvegarder avec succès !');
     }
 }

app/Http/Controllers/JobController.php

@@ -57,6 +57,8 @@ class JobController extends Controller
         $job->permissions = json_encode($tpermission);
         $job->save();
 
+        $job->updateACLRules();
+
         clog('add','success','Poste ajouté avec succès');
         return redirect('/admin/config/jobs')->with('success','Poste ajouté avec succès');
     }
@@ -112,6 +114,8 @@ class JobController extends Controller
         $job->permissions = json_encode($tpermission);
         $job->save();
 
+        $job->updateACLRules();
+
         clog('add','success','Poste modifié avec succès');
         return redirect('/admin/config/jobs')->with('success','Poste modifié avec succès');
     }

app/Http/Controllers/RankController.php

@@ -52,6 +52,8 @@ class RankController extends Controller
         $r->permissions = json_encode($tpermission);
         $r->save();
 
+        $r->updateACLRules();
+
         clog('add','success','Grade ajouté avec succès');
         return redirect('/admin/config/ranks')->with('success','Grade ajouté avec succès');
     }
@@ -99,10 +101,11 @@ class RankController extends Controller
             $tkey = $perm->ckey;
             $tpermission[$tkey] = $request->$tkey;
         }
-
         $r->permissions = json_encode($tpermission);
         $r->save();
 
+        $r->updateACLRules();
+
         clog('edit','success','Grade modifié avec succès');
         return redirect('/admin/config/ranks')->with('success','Grade modifié avec succès');
     }

app/Job.php

@@ -48,4 +48,9 @@ class Job extends Model
     {
         return $this->permission($perm);
     }
+
+    public function updateACLRules()
+    {
+        \App\Permission::updateACLRules($this);
+    }
 }

app/OCOM.php

@@ -116,4 +116,11 @@ class OCOM extends Model
     {
         return $this->nbPeriode * 30;
     }
+
+    public function niveau()
+    {
+        $niveau = -1;
+        preg_match('/[^0\D]/',$this->oren,$niveau);
+        return $niveau[0];
+    }
 }

app/Permission.php

@@ -4,6 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
 /**
  * App\Permission
@@ -15,6 +16,150 @@ use Illuminate\Support\Arr;
  */
 class Permission extends Model
 {
+    const ACLRULES = [
+        'files_cadets' => [
+            '_see' => [
+                [
+                    'path' => 'Prive/Cadet',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Cadet/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                [
+                    'path' => 'Prive/Cadet',
+                    'access' => '2'
+                ],
+                [
+                    'path' => 'Prive/Cadet/*',
+                    'access' => '2'
+                ]
+            ]
+        ],
+        'files_staff' => [
+            '_see' => [
+                [
+                    'path' => 'Prive/Staff',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Staff/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                [
+                    'path' => 'Prive/Staff',
+                    'access' => '2'
+                ],
+                [
+                    'path' => 'Prive/Staff/*',
+                    'access' => '2'
+                ]
+            ]
+        ],
+        'files_etamas' => [
+            '_see' => [
+                [
+                    'path' => 'Prive/ETAMAS',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/ETAMAS/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                [
+                    'path' => 'Prive/ETAMAS',
+                    'access' => '2'
+                ],
+                [
+                    'path' => 'Prive/ETAMAS/*',
+                    'access' => '2'
+                ]
+            ]
+        ],
+        'files_officier' => [
+            '_see' => [
+                [
+                    'path' => 'Prive',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Officier',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Officier/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                [
+                    'path' => 'Prive',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Officier',
+                    'access' => '2'
+                ],
+                [
+                    'path' => 'Prive/Officier/*',
+                    'access' => '2'
+                ]
+            ]
+        ],
+        'files_systeme' => [
+            '_see' => [
+                [
+                    'path' => 'Systeme',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Systeme/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                // Vide
+            ]
+        ],
+        'files_instruction' => [
+            '_see' => [
+                [
+                    'path' => 'Prive/Staff/Instruction',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Staff/Instruction/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+               // Vide
+            ]
+        ],
+        'instruction_guide' => [
+            '_see' => [
+                [
+                    'path' => 'Prive/Staff/Guide',
+                    'access' => '1'
+                ],
+                [
+                    'path' => 'Prive/Staff/Guide/*',
+                    'access' => '1'
+                ]
+            ],
+            '_edit' => [
+                // Vide
+            ]
+        ],
+    ];
+
     const PERMISSIONS = [
         'Nouvelle' => [
             'news_see' => [
@@ -149,6 +294,13 @@ class Permission extends Model
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
+            'config_edit_files' => [
+                'ckey' => 'config_edit_files',
+                'communName' => 'Modifier les configurations de fichier',
+                'desc' => 'L\'utilisateur peut-il modifier les configurations de fichier',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
             'config_edit_customization' => [
                 'ckey' => 'config_edit_customization',
                 'communName' => 'Modifier les configurations de l\'apparence du site',
@@ -253,6 +405,13 @@ class Permission extends Model
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
+            'cadet_list_edit' => [
+                'ckey' => 'cadet_list_edit',
+                'communName' => 'Modifier la liste nominative',
+                'desc' => 'L\'utilisateur peut-il modifier la liste nominative',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
         ],
         'Horaire' => [
             'schedule_see' => [
@@ -345,23 +504,150 @@ class Permission extends Model
             ],
         ],
         'Fichiers' => [
-            'file_see' => [
-                'ckey' => 'file_see',
-                'communName' => 'Voir les fichiers publiques',
-                'desc' => 'L\'utilisateur peut-il consulter les fichiers publiques',
+            'files_cadets_see' => [
+                'ckey' => 'files_cadets_see',
+                'communName' => 'Consulter les fichiers des cadets',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers des cadets',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
-            'drive_see' => [
-                'ckey' => 'drive_see',
-                'communName' => 'Voir l\'explorateur de fichier',
-                'desc' => 'L\'utilisateur peut-il consulter l\'explorateur de fichier',
+            'files_cadets_edit' => [
+                'ckey' => 'files_cadets_edit',
+                'communName' => 'Modifier les fichiers des cadets',
+                'desc' => 'L\'utilisateur peut-il modifier les fichiers des cadets',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_staff_see' => [
+                'ckey' => 'files_staff_see',
+                'communName' => 'Consulter les fichiers des staffs',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers des staffs',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_staff_edit' => [
+                'ckey' => 'files_staff_edit',
+                'communName' => 'Modifier les fichiers des staffs',
+                'desc' => 'L\'utilisateur peut-il modifier les fichiers des staffs',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_etamas_see' => [
+                'ckey' => 'files_etamas_see',
+                'communName' => 'Consulter les fichiers de l\'ETAMAS',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers de l\'ETAMAS',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_etamas_edit' => [
+                'ckey' => 'files_etamas_edit',
+                'communName' => 'Mo
+                difier les fichiers de l\'ETAMAS',
+                'desc' => 'L\'utilisateur peut-il modifier les fichiers de l\'ETAMAS',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_officier_see' => [
+                'ckey' => 'files_officier_see',
+                'communName' => 'Consulter les fichiers des officiers',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers des officiers',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_officier_edit' => [
+                'ckey' => 'files_officier_edit',
+                'communName' => 'Modifier les fichiers des officiers',
+                'desc' => 'L\'utilisateur peut-il modifier les fichiers des officiers',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_systeme_see' => [
+                'ckey' => 'files_systeme_see',
+                'communName' => 'Voir les fichiers systemes',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers systemes',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'files_instruction_see' => [
+                'ckey' => 'files_instruction_see',
+                'communName' => 'Voir les fichiers de l\'instruction',
+                'desc' => 'L\'utilisateur peut-il consulter les fichiers de l\'instruction',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
         ]
     ];
 
+    public static function updateACLRules($o)
+    {
+        $user_id = '0';
+        $rank_id = '0';
+        $job_id = '0';
+
+        switch ($o->table) {
+            case 'users':
+                $user_id = $o->id;
+                break;
+            case 'ranks':
+                $rank_id = $o->id;
+                break;
+            case 'jobs':
+                $job_id = $o->id;
+                break;
+        }
+
+        foreach (self::ACLRULES as $key => $rule)
+        {
+            if ($o->p($key.'_see') == 1) {
+                if ($o->p($key.'_edit') == 1) {
+                    foreach ($rule['_edit'] as $acl) {
+                        self::updateOrInsertACLRules($user_id,$rank_id,$job_id,'storage',$acl['path'],$acl['access']);
+                    }
+                } else {
+                    foreach ($rule['_see'] as $acl) {
+                        self::updateOrInsertACLRules($user_id,$rank_id,$job_id,'storage',$acl['path'],$acl['access']);
+                    }
+                }
+            } else {
+                foreach ($rule['_see'] as $acl) {
+                    self::removeACLRules($user_id,$rank_id,$job_id,'storage',$acl['path']);
+                }
+            }
+        }
+    }
+
+    public static function removeACLRules($userId,$rankId,$jobId,$disk,$path)
+    {
+        $rules = DB::table('acl_rules')->where([
+            ['user_id',$userId],
+            ['rank_id',$rankId],
+            ['job_id',$jobId],
+            ['disk',$disk],
+            ['path',$path]
+        ]);
+        $rules->delete();
+    }
+
+    public static function updateOrInsertACLRules($userId,$rankId,$jobId,$disk,$path,$access)
+    {
+        DB::table('acl_rules')->updateOrInsert(
+            ['user_id' => $userId, 'rank_id' => $rankId, 'job_id' => $jobId, 'disk' => $disk, 'path' => $path],
+            ['access' => $access]
+        );
+    }
+
+    public static function addACLRules($userId,$rankId,$jobId,$disk,$path,$access)
+    {
+        DB::table('acl_rules')->insertOrIgnore([
+           'user_id' => $userId,
+           'rank_id' => $rankId,
+           'job_id' => $jobId,
+           'disk' => $disk,
+           'path' => $path,
+           'access' => $access
+        ]);
+    }
+
     public static function all($value = null,$columns = null)
     {
 

app/Rank.php

@@ -50,4 +50,9 @@ class Rank extends Model
     {
         return $this->permission($perm);
     }
+
+    public function updateACLRules()
+    {
+        \App\Permission::updateACLRules($this);
+    }
 }

app/User.php

@@ -387,4 +387,30 @@ class User extends Authenticatable
             return Carbon::parse($val->created_at)->format('Y-m-d');
         });
     }
+
+    public function checkACLRules($rule)
+    {
+        if ($rule->user_id == $this->id || $rule->user_id == '*')
+        {
+            return $rule->access;
+        }
+        if ($rule->job_id == $this->job_id || $rule->job_id == '*')
+        {
+            return $rule->access;
+        }
+        if ($rule->rank_id == $this->rank_id || $rule->rank_id == '*')
+        {
+            return $rule->access;
+        }
+        return -1;
+    }
+
+    public function checkACLRulesVisitor($rule)
+    {
+        if ($rule->user_id == '*')
+        {
+            return $rule->access;
+        }
+        return -1;
+    }
 }