#31 [AdminConf] add: change rights on config page

Evarisk · Nov 3, 2022 · d36a316 · d36a316
1 parent d04faef
commit d36a316
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 51 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -45,12 +45,13 @@
 // Translations
 $langs->loadLangs(array("errors", "admin", "dolisirh@dolisirh"));
 
-// Initialize objects
-// Technical objets
+// Initialize technical objects
 $modDoliSIRH = new modDoliSIRH($db);
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * View
@@ -64,9 +65,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss);
 
 // Subheader
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1'.'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($title, $linkback, 'dolisirh_red@dolisirh');
+print load_fiche_titre($title, '', 'dolisirh_red@dolisirh');
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
@@ -77,4 +76,4 @@
 // Page end
 print dol_get_fiche_end();
 llxFooter();
-$db->close();
+$db->close();
diff --git a/admin/certificate.php b/admin/certificate.php
@@ -48,16 +48,13 @@
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "dolisirh@dolisirh"));
 
-// Get parameters
-$action     = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-// Initialize objects
-// Technical objets
+// Initialize technical objects
 $object = new Certificate($db);
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * View
@@ -74,9 +71,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss);
 
 // Subheader
-$linkback = '<a href="'.($backtopage ?: DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($title, $linkback, 'object_'.$object->picto);
+print load_fiche_titre($title, '', 'object_'.$object->picto);
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();

diff --git a/admin/dolisirhdocuments.php b/admin/dolisirhdocuments.php
@@ -36,30 +36,30 @@
 if (!$res && file_exists("../../../../main.inc.php")) $res = @include "../../../../main.inc.php";
 if (!$res) die("Include of main fails");
 
-// Global variables definitions
-global $conf, $db, $langs, $user;
-
 // Libraries
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 require_once '../lib/dolisirh.lib.php';
 
+// Global variables definitions
+global $conf, $db, $langs, $user;
+
 // Translations
 $langs->loadLangs(array("admin", "dolisirh@dolisirh"));
 
-
-// Parameters
+// Get parameters
 $action     = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
 $value      = GETPOST('value', 'alpha');
 $type       = GETPOST('type', 'alpha');
 $const 		= GETPOST('const', 'alpha');
 $label 		= GETPOST('label', 'alpha');
 $modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * Actions
@@ -183,7 +183,7 @@
  * View
  */
 
-// Initialize objects
+// Initialize view objects
 $form = new Form($db);
 
 $help_url = 'FR:Module_DoliSIRH';

diff --git a/admin/project.php b/admin/project.php
@@ -49,18 +49,13 @@
 // Translations
 $langs->loadLangs(array("errors", "admin", "dolisirh@dolisirh"));
 
-// Parameters
-$action     = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-// Initialize objects
-// View objets
-$form        = new Form($db);
-$formother   = new FormOther($db);
-$formproject = new FormProjets($db);
+// Get parameters
+$action = GETPOST('action', 'alpha');
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * Actions
@@ -103,6 +98,11 @@
  * View
  */
 
+// Initialize view objects
+$form        = new Form($db);
+$formother   = new FormOther($db);
+$formproject = new FormProjets($db);
+
 $help_url = 'FR:Module_DoliSIRH';
 $title    = $langs->trans("ProjectsAndTasks");
 $morejs   = array("/dolisirh/js/dolisirh.js.php");
@@ -111,9 +111,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss);
 
 // Subheader
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1'.'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($title, $linkback, 'dolisirh_red@dolisirh');
+print load_fiche_titre($title, '', 'dolisirh_red@dolisirh');
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();

diff --git a/admin/setup.php b/admin/setup.php
@@ -37,25 +37,27 @@
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+
 require_once '../lib/dolisirh.lib.php';
 
+// Global variables definitions
 global $conf, $db, $langs, $user;
 
 // Translations
 $langs->loadLangs(array("admin", "dolisirh@dolisirh"));
 
-// Parameters
+// Get parameters
 $action = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$value = GETPOST('value', 'alpha');
+$value  = GETPOST('value', 'alpha');
 
 $arrayofparameters = array(
-	'DOLISIRH_DEFAUT_TICKET_TIME'=>array('css'=>'minwidth200', 'enabled'=>1),
+    'DOLISIRH_DEFAUT_TICKET_TIME' => array('css' => 'minwidth200', 'enabled' => 1),
 );
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * Actions
@@ -69,9 +71,9 @@
  * View
  */
 
+// Initialize view objects
 $form = new Form($db);
 
-
 $help_url = 'FR:Module_DoliSIRH';
 $title    = $langs->trans("DoliSIRHSetup");
 $morejs   = array("/dolisirh/js/dolisirh.js.php");

diff --git a/admin/timesheet.php b/admin/timesheet.php
@@ -52,12 +52,13 @@
 $action     = GETPOST('action', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-// Initialize objects
-// Technical objets
+// Initialize technical objects
 $object = new TimeSheet($db);
 
 // Access control
-if (!$user->admin) accessforbidden();
+$permissiontoread = $user->rights->dolisirh->adminpage->read;
+if (empty($conf->dolisirh->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 /*
  * View
@@ -74,9 +75,7 @@
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss);
 
 // Subheader
-$linkback = '<a href="'.($backtopage ?: DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($title, $linkback, 'object_'.$object->picto);
+print load_fiche_titre($title, '', 'object_'.$object->picto);
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();