Changeset 17861

Show
Ignore:
Timestamp:
10/02/08 13:16:00 (2 months ago)
Author:
rambo
Message:

forward port r17860

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.admin.folder/handler/approvals.php

    r17488 r17861  
    6262        } 
    6363 
     64        /**  
     65         * This flag is used to make it possible to explicitly recognize user intent 
     66         * to for example do speacial operations in midcom.helper.replicator 
     67         */ 
     68        if (   !isset($GLOBALS['midcom_admin_folder_handler_approvals']) 
     69            || !is_array($GLOBALS['midcom_admin_folder_handler_approvals'])) 
     70        { 
     71            $GLOBALS['midcom_admin_folder_handler_approvals'] = array(); 
     72        } 
    6473        if ($handler_id == '____ais-folder-approve') 
    6574        { 
     75            $GLOBALS['midcom_admin_folder_handler_approvals'][$object->guid] = 'approve'; 
    6676            $metadata->approve(); 
    6777        } 
    6878        else 
    6979        { 
     80            $GLOBALS['midcom_admin_folder_handler_approvals'][$object->guid] = 'unapprove'; 
    7081            $metadata->unapprove(); 
    7182        } 

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

    r16800 r17861  
    77    'midcom_core_temporary_object_db', 
    88), 
     9'exporter_staging2live_delete_unapproved' => false, // Upon explicit un-approve, do we wish to delete from live ?? 
    910'exporter_staging2live_check_approvals_for' => array 
    1011( 

  • trunk/midcom/midcom.helper.replicator/exporter/staging2live.php

    r17650 r17861  
    5656    function is_exportable(&$object, $check_exported = true) 
    5757    { 
     58        /** 
     59         * First check of them all: 
     60         *  In case we have explicit un-approve AND we have configured to do 
     61         *  so, serialize the object as deletion to the live server 
     62         */ 
     63        if (   isset($GLOBALS['midcom_admin_folder_handler_approvals']) 
     64            && isset($GLOBALS['midcom_admin_folder_handler_approvals'][$object->guid]) 
     65            && $GLOBALS['midcom_admin_folder_handler_approvals'][$object->guid] == 'unapprove' 
     66            && $this->_config->get('exporter_staging2live_delete_unapproved')) 
     67        { 
     68            $GLOBALS['midcom_helper_replicator_logger']->push_prefix('exporter'); 
     69            $GLOBALS['midcom_helper_replicator_logger']->log_object($object, 'Explicit un-approve detected, rewriting as deletion to live', MIDCOM_LOG_WARN); 
     70            $GLOBALS['midcom_helper_replicator_logger']->pop_prefix(); 
     71            $this->exportability[$object->guid] = true; 
     72            $this->_serialize_rewrite_to_delete[$object->guid] = true; 
     73            return $this->exportability[$object->guid]; 
     74        } 
    5875        /* 
    5976        debug_push_class(__CLASS__, __FUNCTION__); 

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

    r17556 r17861  
    182182                 
    183183                $msg = "Queued {$key} as {$file}"; 
    184                 $GLOBALS['midcom_helper_replicator_logger']->log($msg); 
     184                $GLOBALS['midcom_helper_replicator_logger']->log($msg, MIDCOM_LOG_INFO); 
    185185                debug_add($msg); 
    186186