Changeset 16414 for trunk

Show
Ignore:
Timestamp:
05/20/08 13:09:38 (2 months ago)
Author:
rambo
Message:

forward port r16413

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.core/midcom/cron/purgedeleted.php

    r16412 r16414  
    3333        debug_push_class(__CLASS__, __FUNCTION__); 
    3434        debug_add('called!'); 
    35         $cut_off = mktime(23, 59, 59, date('n'), date('j')-$$GLOBALS['midcom_config']['cron_pure_deleted_after'], date('Y')); 
     35        $cut_off = mktime(23, 59, 59, date('n'), date('j')-$GLOBALS['midcom_config']['cron_pure_deleted_after'], date('Y')); 
    3636        foreach ($_MIDGARD['schema']['types'] as $mgdschema => $dummy) 
    3737        { 
    …… 
    6363            if ($found > 0) 
    6464            { 
    65                 debug_add("Found {$found} {$mgdschema} objects, purged {$purged}", MIDCOM_LOG_INFO); 
     65                debug_add("Found {$found} {$mgdschema} objects deleted before " . date('Y-m-d H:i:s', $cut_off) . ", purged {$purged}", MIDCOM_LOG_INFO); 
    6666            } 
    6767            else 
    6868            { 
    69                 debug_add("No {$mgdschema} objects deleted before " . gmdate('Y-m-d H:i:s', $cut_off) . "UTC (in sitegroup {$_MIDGARD['sitegroup']}) found"); 
     69                debug_add("No {$mgdschema} objects deleted before " . date('Y-m-d H:i:s', $cut_off) . " (in sitegroup {$_MIDGARD['sitegroup']}) found"); 
    7070            } 
    7171        } 

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

    r16410 r16414  
    7070    function _on_watched_operation($operation, &$object) 
    7171    { 
    72         $skip_classes = $this->_config->get('watcher_skip_classes'); 
    73         foreach ($skip_classes as $class) 
    74         { 
    75             if (is_a($object, $class)) 
     72        $config = $this->get_config_for_topic(); 
     73        $skip_classes = $config->get('watcher_skip_classes'); 
     74        if (is_array($skip_classes)) 
     75        { 
     76            foreach ($skip_classes as $class) 
    7677            { 
    77                 return; 
     78                if (is_a($object, $class)) 
     79                { 
     80                    return; 
     81                } 
    7882            } 
    7983        }