Permissions.
このコミットが含まれているのは:
コミット
a6daf76ae3
|
@ -80,12 +80,17 @@ class AuthController extends Controller {
|
|||
// $grouppermimg = $this->objPermission->getPermissionGroup('img', $perm['perm_id']);
|
||||
// $userpermimg = $this->objPermission->getPermissionUser('img', $check);
|
||||
|
||||
// Invoice permissions.
|
||||
$groupperminv = $this->objPermission->getPermissionGroup('inv', $perm['perm_id']);
|
||||
$userperminv = $this->objPermission->getPermissionUser('inv', $check);
|
||||
|
||||
// Now provide an array of user overwritten permissions if it exists. Otherwise, give its group permissions.
|
||||
$blgarr = array();
|
||||
$forarr = array();
|
||||
$strarr = array();
|
||||
$usrarr = array();
|
||||
// $imgarr = array();
|
||||
$invarr = array();
|
||||
|
||||
if (!empty($userpermblg[0])) {
|
||||
$blgarr = (array)$userpermblg[0];
|
||||
|
@ -135,6 +140,18 @@ class AuthController extends Controller {
|
|||
$usrarr
|
||||
);
|
||||
|
||||
if (!empty($userperminv[0])) {
|
||||
$invarr = (array)$userperminv[0];
|
||||
}
|
||||
else {
|
||||
$invarr = (array)$groupperminv[0];
|
||||
}
|
||||
|
||||
$invarr = array_combine(
|
||||
array_map(function($k){ return 'inv_'.$k; }, array_keys($invarr)),
|
||||
$invarr
|
||||
);
|
||||
|
||||
/* if (!empty($userpermimg[0])) {
|
||||
$imgarr = (array)$userpermimg[0];
|
||||
}
|
||||
|
@ -145,11 +162,13 @@ class AuthController extends Controller {
|
|||
$merge = array();
|
||||
$merge1 = array();
|
||||
$merge2 = array();
|
||||
$merge3 = array();
|
||||
|
||||
$merge1 = array_merge($blgarr, $forarr);
|
||||
$merge2 = array_merge($strarr, $usrarr);
|
||||
$merge3 = array_merge($merge1, $merge2);
|
||||
|
||||
$merge = array_merge($merge1, $merge2);
|
||||
$merge = array_merge($merge3, $invarr);
|
||||
|
||||
return $merge;
|
||||
}
|
||||
|
@ -169,6 +188,9 @@ class AuthController extends Controller {
|
|||
// Image permissions.
|
||||
// $grouppermimg = $this->objPermission->getPermissionGroup('img', 6);
|
||||
|
||||
// Invoice permissions.
|
||||
$groupperminv = $this->objPermission->getPermissionGroup('inv', 6);
|
||||
|
||||
// Since guests don't have user overwritten permissions, simply return the group permissions.
|
||||
(array)$grouppermblg[0] = array_combine(
|
||||
array_map(function($k){ return 'blg_'.$k; }, array_keys((array)$grouppermblg[0])),
|
||||
|
@ -195,14 +217,21 @@ class AuthController extends Controller {
|
|||
(array)$grouppermimg[0]
|
||||
); */
|
||||
|
||||
(array)$groupperminv[0] = array_combine(
|
||||
array_map(function($k){ return 'inv_'.$k; }, array_keys((array)$groupperminv[0])),
|
||||
(array)$groupperminv[0]
|
||||
);
|
||||
|
||||
$merge = array();
|
||||
$merge1 = array();
|
||||
$merge2 = array();
|
||||
$merge3 = array();
|
||||
|
||||
$merge1 = array_merge((array)$grouppermblg[0], (array)$grouppermfor[0]);
|
||||
$merge2 = array_merge((array)$grouppermstr[0], (array)$grouppermusr[0]);
|
||||
$merge3 = array_merge($merge1, $merge2);
|
||||
|
||||
$merge = array_merge($merge1, $merge2);
|
||||
$merge = array_merge($merge3, (array)$groupperminv[0]);
|
||||
|
||||
return $merge;
|
||||
}
|
||||
|
|
新しいイシューから参照