Khaos :: KhACL

[eluser]bardelot[/eluser]
I found some bugs in the library when I tried to use it:

Code:

function map($aro_tree, $aco_tree)
    {                
        $map        = array(); // Holds final access map
        $interested = array(); // Holds records for which we are interested in

        // Build the array of aro/aco pairs were interested in      
        foreach ($aro_tree as $aro)
            foreach ($aco_tree as $aco)
                $interested[] = '('.$this->_Tables['access'].'.aro_id = '.$aro->id.' AND '.$this->_Tables['access'].'.aco_id = '.$aco->id.')';

// add - BEGIN
        if (count($interested) == 0)
            return false;
// add - END
[...]
            // If there are any AXO build the extensions array
            if ($rs_axo->num_rows(0) > 0)
            {
// change next line
                foreach ($rs_axo->result() as $axo_map)

Code:

function _set($aro, $aco, $axo = null, $allow = true)
[...]
        /*
         * If needed create/modify the access -> action link in the access_actions table
         */
        
        if ($axo !== null)
        {
            if (($rs = $this->_CI->db->query('SELECT id, allow FROM '.$this->_Tables['access_actions'].' WHERE access_id = ? AND axo_id = ? LIMIT 1', array($access_id, $axo_id))) !== false)
            {
                if ($rs->num_rows() === 0) // create link
                {
// change next line
                    if (!$this->_CI->db->query('INSERT INTO '.$this->_Tables['access_actions'].' (access_id, axo_id, allow) VALUES (?, ?, ?)', array($access_id, $axo_id, $allow)))

Code:

/**
     * Create ARO
     *
     * @param string $aro
     * @param string $parent
     * @param int    $link
     *
     * @return bool
     * @access public
     */
    function create($aro, $parent = null, $link = null)
[...]
                // Update all records past the left point by 2 to make room for the new ARO
                $this->_CI->db->query('UPDATE '.$this->_Tables['aros'].' SET rgt = rgt + 2 WHERE rgt > '.$left);
                $this->_CI->db->query('UPDATE '.$this->_Tables['aros'].' SET lft = lft + 2 WHERE lft > '.$left);
                
                // Insert the record
// change next line
                $this->_CI->db->query('INSERT INTO '.$this->_Tables['aros'].' (lft, rgt, name, link) VALUES ('.($left + 1).', '.($left + 2).', '.$this->_CI->db->escape($aro).', '.$link.')');

Code:

/**
     * Create ACO
     *
     * @param string $aco
     * @param string $parent
     * @param int    $link
     *
     * @return bool
     * @access public
     */
    function create($aco, $parent = null, $link = null)
[...]
                // Update all records past the left point by 2 to make room for the new ARO
                $this->_CI->db->query('UPDATE '.$this->_Tables['acos'].' SET rgt = rgt + 2 WHERE rgt > '.$left);
                $this->_CI->db->query('UPDATE '.$this->_Tables['acos'].' SET lft = lft + 2 WHERE lft > '.$left);
                
                // Insert the record
// change next line
                $this->_CI->db->query('INSERT INTO '.$this->_Tables['acos'].' (lft, rgt, name, link) VALUES ('.($left + 1).', '.($left + 2).', '.$this->_CI->db->escape($aco).', '.$link.')');

Code:

In your example you might want to change:
// Examples - KhACL->AXO
$this->khacl->aro->create('publish');
$this->khacl->aro->delete('publish');

into

// Examples - KhACL->AXO
$this->khacl->axo->create('publish');
$this->khacl->axo->delete('publish');