Changeset 16293

Show
Ignore:
Timestamp:
05/02/08 14:02:24 (4 months ago)
Author:
rambo
Message:

use the proper helpers for queue path location

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/MidCOM_2_8/midcom.helper.replicator/config/config.inc

    r16096 r16293  
    1 'queue_root_dir' => '/var/spool/midgard/replicator_queue//', 
     1'queue_root_dir' => '/var/spool/midgard/replicator_queue/', 
    22'log_filename'   => "{$GLOBALS['midcom_config']['log_filename']}.replicator", 
    33'exporter_staging2live_check_approvals_for' => array 

  • branches/MidCOM_2_8/midcom.helper.replicator/style/midcom-helper-replicator-list.php

    r16098 r16293  
    22 
    33<?php 
    4 // FIXME: the configs may have all kinds of dynamic parts, also should be per subscription 
    5 if (!is_dir($data['local_config']->get('queue_root_dir'))) 
     4$qm =& midcom_helper_replicator_queuemanager::get(); 
     5$dummy = new midcom_helper_replicator_subscription_dba(); 
     6$dummy->sitegroup = $_MIDGARD['sitegroup']; 
     7$sg_queue_path = $qm->get_sg_basedir($dummy); 
     8unset($dummy); 
     9if (!is_dir($sg_queue_path)) 
    610{ 
    711    ?> 
    812    <p class="error"> 
    913        <?php 
    10         echo sprintf($_MIDCOM->i18n->get_string('replication queue %s does not exist', 'midcom.helper.replicator'), "<code>" . $data['local_config']->get('queue_root_dir') . "</code>"); 
     14        echo sprintf($_MIDCOM->i18n->get_string('replication queue %s does not exist', 'midcom.helper.replicator'), "<code>" . $sg_queue_path . "</code>"); 
    1115        ?> 
    1216    </p> 
    1317    <?php 
    1418} 
    15 elseif (!is_writable($data['local_config']->get('queue_root_dir'))) 
     19elseif (!is_writable($sg_queue_path)) 
    1620{ 
    1721    ?> 
    1822    <p class="error"> 
    1923        <?php 
    20         echo sprintf($_MIDCOM->i18n->get_string('replication queue %s cannot be written by Apache user', 'midcom.helper.replicator'), "<code>" . $data['local_config']->get('queue_root_dir') . "</code>"); 
     24        echo sprintf($_MIDCOM->i18n->get_string('replication queue %s cannot be written by Apache user', 'midcom.helper.replicator'), "<code>" . $sg_queue_path . "</code>"); 
    2125        ?> 
    2226    </p> 
    …… 
    2832    <p> 
    2933        <?php 
    30         echo sprintf($_MIDCOM->i18n->get_string('replication queue is stored to %s', 'midcom.helper.replicator'), "<code>" . $data['local_config']->get('queue_root_dir') . "</code>"); 
     34        echo sprintf($_MIDCOM->i18n->get_string('replication queue is stored to %s', 'midcom.helper.replicator'), "<code>" . $sg_queue_path . "</code>"); 
    3135        ?> 
    3236    </p> 
    …… 
    5357            { 
    5458                $transporter = midcom_helper_replicator_transporter::create($subscription); 
    55                 $queued_items = $qm->list_path_items($qm->get_subscription_basedir($subscription)); 
    56                 $quarantined_items = $qm->list_path_items($qm->get_subscription_quarantine_basedir($subscription)); 
     59                $queue_path = $qm->get_subscription_basedir($subscription); 
     60                $queued_items = $qm->list_path_items($queue_path); 
     61                $quarantine_path = $qm->get_subscription_quarantine_basedir($subscription); 
     62                $quarantined_items = $qm->list_path_items($quarantine_path); 
    5763                ?> 
    5864                <tr> 
    59                     <td><?php echo count($queued_items) . '&nbsp;/&nbsp;' . count($quarantined_items); ?></td> 
     65                    <td><?php echo "<abbr title='{$queue_path}'>" . count($queued_items) . "</abbr>&nbsp;/&nbsp;<abbr title='{$quarantine_path}'>" . count($quarantined_items) . '</abbr>'; ?></td> 
    6066                    <td><a href="&(prefix);edit/&(subscription.guid);/">&(subscription.title);</a></th> 
    6167                    <td><?php echo $_MIDCOM->i18n->get_string($data['schemadb'][$subscription->exporter]->description, 'midcom.helper.replicator'); ?></td> 
    …… 
    6369                </tr> 
    6470                <?php 
     71                unset($queued_items, $queue_path, $quarantined_items, $quarantine_path); 
    6572            } 
    6673            ?>