Skip to content

Merge new stuff to one and publish it as new composer package #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
q-u-o-s-a wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Merge new stuff to one and publish it as new composer package #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9cb1ebc
remove warning
fldei101 Jan 31, 2022
dbbb1bc
change repo in composer
fldei101 Jan 31, 2022
5980441
make construct more general
fldei101 Mar 16, 2022
e156649
add tableprefix
fldei101 Mar 16, 2022
4772ca8
bugfix naming
fldei101 Mar 16, 2022
e241257
add wildcard
fldei101 Jul 21, 2022
35f95dd
bugfix
fldei101 Jul 21, 2022
f93a9f4
Update composer.json
q-u-o-s-a Apr 30, 2024
55738e6
fix: warning: Undefined variable $DepthConcat
q-u-o-s-a Apr 30, 2024
d50f701
fix call for changeing php 8 param order
q-u-o-s-a Apr 30, 2024
a5cfeed
fix descendantsConditional, since argument order broke method
q-u-o-s-a Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion PhpRbac/src/PhpRbac/Rbac.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace PhpRbac;

use \Jf;
Expand All @@ -13,14 +14,21 @@
*/
class Rbac
{
public function __construct($unit_test = '')
public function __construct($ProvidedHostname = false, $ProvidedDbname = false, $ProvidedUsername = false, $ProvidedPassword = false, $ProvidedAdapter = false, $ProvidedTablePrefix = false, $unit_test = '')
{
if ((string) $unit_test === 'unit_test') {
require_once dirname(dirname(__DIR__)) . '/tests/database/database.config';
} else {
require_once dirname(dirname(__DIR__)) . '/database/database.config';
}

if ($ProvidedHostname) $host = $ProvidedHostname;
if ($ProvidedDbname) $dbname = $ProvidedDbname;
if ($ProvidedUsername) $user = $ProvidedUsername;
if ($ProvidedPassword) $pass = $ProvidedPassword;
if ($ProvidedAdapter) $adapter = $ProvidedAdapter;
if ($ProvidedTablePrefix) $tablePrefix = $ProvidedTablePrefix;

require_once 'core/lib/Jf.php';

$this->Permissions = Jf::$Rbac->Permissions;
Expand Down Expand Up @@ -52,6 +60,11 @@ public function tablePrefix()
{
return Jf::$Rbac->tablePrefix();
}

public function getWildcardPermissionList($search)
{
return Jf::$Rbac->getWildcardPermissionList($search);
}
}

/** @} */ // End group phprbac */
9 changes: 5 additions & 4 deletions PhpRbac/src/PhpRbac/core/lib/nestedset/full.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ function deleteConditional($ConditionString);


function childrenConditional($ConditionString);
function descendantsConditional($AbsoluteDepths=false,$ConditionString);
function descendantsConditional($ConditionString,$AbsoluteDepths=false);
function leavesConditional($ConditionString=null);
function pathConditional($ConditionString);

function depthConditional($ConditionString);
function parentNodeConditional($ConditionString);
function siblingConditional($SiblingDistance=1,$ConditionString);
function siblingConditional($ConditionString,$SiblingDistance=1);
/**/
}
/**
Expand Down Expand Up @@ -118,7 +118,7 @@ function depthConditional($ConditionString,$Rest=null)
* @param string $Rest optional, rest of variables to fill in placeholders of condition string, one variable for each ? in condition
* @return Array Node on success, null on failure
*/
function siblingConditional($SiblingDistance=1,$ConditionString,$Rest=null)
function siblingConditional($ConditionString,$SiblingDistance=1,$Rest=null)
{
$Arguments=func_get_args();
$ConditionString=$ConditionString; //prevent warning
Expand Down Expand Up @@ -224,8 +224,9 @@ function deleteSubtreeConditional($ConditionString,$Rest=null)
* @return Rowset including Depth field
* @seealso children
*/
function descendantsConditional($AbsoluteDepths=false,$ConditionString,$Rest=null)
function descendantsConditional($ConditionString,$AbsoluteDepths=false,$Rest=null)
{
$DepthConcat = "";
if (!$AbsoluteDepths)
$DepthConcat="- (sub_tree.innerDepth )";
$Arguments=func_get_args();
Expand Down
Loading