Changeset 16081

Show
Ignore:
Timestamp:
04/15/08 08:54:09 (6 months ago)
Author:
rambo
Message:

forward port r16080

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.helper.replicator/config/manifest.inc

    r15056 r16081  
    44'version' => '0.1.0beta1', 
    55'state' => 'beta', 
    6 'privileges' => array(), 
     6'privileges' => array 
     7( 
     8    'manage' => MIDCOM_PRIVILEGE_DENY, 
     9), 
    710'class_definitions' => array 
    811( 

  • trunk/midcom/midcom.helper.replicator/manager.php

    r14655 r16081  
    191191    function _handler_list($handler_id, $args, &$data) 
    192192    { 
    193         $_MIDCOM->auth->require_admin_user(); 
     193        $_MIDCOM->auth->require_user_do('midcom.helper.replicator:manage'); 
    194194 
    195195        $qb = midcom_helper_replicator_subscription_dba::new_query_builder(); 
    …… 
    268268    { 
    269269        $this->_subscription = new midcom_helper_replicator_subscription_dba($args[0]); 
    270         if (!$this->_subscription) 
     270        if (   !is_object($this->_subscription) 
     271            || !isset($this->_subscription->guid) 
     272            || empty($this->_subscription->guid)) 
    271273        { 
    272274            return false; 
    …… 
    351353    function _handler_create($handler_id, $args, &$data) 
    352354    { 
    353         $_MIDCOM->auth->require_admin_user(); 
     355        $_MIDCOM->auth->require_user_do('midcom.helper.replicator:manage'); 
    354356 
    355357        $this->_schema = $args[0]; 
    …… 
    421423    function _handler_object($handler_id, $args, &$data) 
    422424    { 
    423         $_MIDCOM->auth->require_admin_user(); 
     425        $_MIDCOM->auth->require_user_do('midcom.helper.replicator:manage'); 
    424426 
    425427        $bind_toolbar = true; 

  • trunk/midcom/midcom.helper.replicator/subscription.php

    r14613 r16081  
    9797        return true; 
    9898    } 
     99 
     100    /** 
     101     * As default only admins can read subscriptions that do not have specific privileges granted. 
     102     */ 
     103    function get_class_magic_default_privileges() 
     104    { 
     105        $privileges = parent::get_class_magic_default_privileges(); 
     106        $privileges['EVERYONE']['midgard:read'] = MIDCOM_PRIVILEGE_DENY; 
     107        return $privileges; 
     108    } 
    99109} 
    100110?>