deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to work with KH 3.3

Browse Source
This commit is contained in:
Deon George
2012-11-26 16:57:18 +11:00
parent 5bd1841571
commit fc2ffd7bad
97 changed files with 5459 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/views/domain/detail.php
View File

@@ -14,10 +14,10 @@
<td>OS</td>
<td>Last Access</td>
<td>Last IP Addr</td>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<td><?php echo $ctype[0]; ?></td>
<?php } ?>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<td colspan="3" class="right"><?php echo $type; ?>(Vol/Fil/Dat)</td>
<?php } ?>
</tr>
@@ -28,10 +28,10 @@
<td class="data"><?php echo $no->platform(); ?></td>
<td class="data"><?php echo $no->display('LASTACC_TIME'); ?></td>
<td class="data"><?php echo $no->display('TCP_ADDRESS'); ?></td>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<td class="data"><?php echo $no->hasData($btype) ? 'Y' : 'N'; ?></td>
<?php } ?>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<td class="data-right"><?php echo count($no->getStorageTypeVols($type)); ?></td>
<td class="data-right"><?php echo $no->getStorageTypeFiles($type); ?></td>
<td class="data-right"><?php echo $no->getStorageTypeData($type); ?></td>
@@ -68,11 +68,11 @@
<td class="right">Files</td>
<td class="right">MB</td>
</tr>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<tr class="subhead">
<td colspan="15"><?php echo $btype; ?></td>
</tr>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<tr class="subhead">
<td>&nbsp;</td>
<td colspan="14"><?php echo $type; ?></td>
@@ -125,11 +125,11 @@
<td class="right">Nodes</td>
<td class="right">Location</td>
</tr>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<tr class="subhead">
<td colspan="14"><?php echo $btype; ?></td>
</tr>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<tr class="subhead">
<td>&nbsp;</td>
<td colspan="13"><?php echo $type; ?></td>

12
application/views/library/detail.php
View File

@@ -82,7 +82,7 @@
<td class="data" colspan="8"><?php echo count($lo->readonlyvol()); ?></td>
</tr>
<tr>
<td colspan="2">&sup1; Stale Storage Pool Volumes (<span class="data"><?php echo Kohana::config('config.tsmtapeage'); ?></span> days)</td>
<td colspan="2">&sup1; Stale Storage Pool Volumes (<span class="data"><?php echo Kohana::$config->load('config')->tsmtapeage; ?></span> days)</td>
<td class="data" colspan="8"><?php echo count($lo->stalevol()); ?></td>
</tr>
<tr>
@@ -101,7 +101,7 @@
<tr>
<td colspan="2">Storage Type</td>
<?php foreach (array('IN','OUT') as $inout) { ?>
<?php foreach (Kohana::config('config.tsmvolstatus') as $status) { ?>
<?php foreach (Kohana::$config->load('config')->tsmvolstatus as $status) { ?>
<td class="right"><?php printf('%s: %s',$inout,$status); ?></td>
<?php } ?>
<?php } ?>
@@ -113,7 +113,7 @@
<td colspan="3">&nbsp;</td>
<?php } ?>
</tr>
<?php $i=0; foreach (Kohana::config('config.tsmdbtypes') as $type) { ?>
<?php $i=0; foreach (Kohana::$config->load('config')->tsmdbtypes as $type) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td>&nbsp;</td>
<td><?php echo $type; ?></td>
@@ -123,11 +123,11 @@
<?php } ?>
</tr>
<?php } ?>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data" colspan="2"><?php echo $type; ?></td>
<?php foreach (array('IN','OUT') as $inout) { ?>
<?php foreach (Kohana::config('config.tsmvolstatus') as $status) { ?>
<?php foreach (Kohana::$config->load('config')->tsmvolstatus as $status) { ?>
<td class="data-right"><?php echo count($lo->volstype($type,$inout,$status)); ?></td>
<?php } ?>
<?php } ?>
@@ -137,7 +137,7 @@
<td>&nbsp;</td>
<td><?php echo $spo; ?></td>
<?php foreach (array('IN','OUT') as $inout) { ?>
<?php foreach (Kohana::config('config.tsmvolstatus') as $status) { ?>
<?php foreach (Kohana::$config->load('config')->tsmvolstatus as $status) { ?>
<td class="right"><?php echo count($spo->libvolstype($inout,$status)); ?></td>
<?php } ?>
<?php } ?>

10
application/views/node/detail_filesystem.php
View File

@@ -13,7 +13,7 @@
<td>File Space</td>
<td>Last Date</td>
<td class="right">Utilisation</td>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type)
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('Bkup',$type)))
foreach ($pools as $pool_name) { ?>
<td class="right"><?php echo $pool_name; ?> <span style="vertical-align: super; font-size: 60%;"><?echo $type; ?></span></td>
@@ -24,7 +24,7 @@
<td class="data"><?php echo $fso->display('FILESPACE_NAME'); ?></td>
<td class="data"><?php echo $fso->display('BACKUP_END'); ?></td>
<td class="data-right"><?php echo number_format($fso->utilsation(),2); ?></td>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type)
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('Bkup',$type)))
foreach ($pools as $pool_name) { ?>
<td class="data-right"><?php echo number_format($fso->pool_logical_util($pool_name,'Bkup'),2); ?> (<?php echo $fso->pool_numvols($pool_name,'BACKUP'); ?>)</td>
@@ -50,7 +50,7 @@
<td class="right">Files</td>
<td class="right">MB</td>
</tr>
<?php $i=0; foreach (Kohana::config('config.tsmpooltypes') as $type) { ?>
<?php $i=0; foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data" colspan="2"><?php echo $type; ?></td>
<td class="data-right"><?php echo count($node->getStorageTypeVols($type)); ?></td>
@@ -82,7 +82,7 @@
</tr>
<tr>
<td>File Space</td>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type)
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('Arch',$type)))
foreach ($pools as $pool_name) { ?>
<td class="right"><?php echo $pool_name; ?> <span style="vertical-align: super; font-size: 60%;"><?echo $type; ?></span></td>
@@ -91,7 +91,7 @@
<?php $i=0;foreach ($node->FILESPACE->find_all() as $fso) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data"><?php echo $fso->display('FILESPACE_NAME'); ?></td>
<?php foreach (Kohana::config('config.tsmpooltypes') as $type)
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('Arch',$type)))
foreach ($pools as $pool_name) { ?>
<td class="data-right"><?php echo number_format($fso->pool_logical_util($pool_name,'Arch'),2); ?> (<?php echo $fso->pool_numvols($pool_name,'ARCHIVE'); ?>)</td>

2
application/views/node/detail_volumes.php
View File

@@ -1,5 +1,5 @@
<table width="100%">
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<tr>
<td style="width: 100%; vertical-align: top;">
<table class="box-full">

4
application/views/stgpool/detail.php
View File

@@ -189,7 +189,7 @@
<td class="right">Errors R/W</td>
<td class="right">Util %</td>
<td class="right">Reclaim</td>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<td class="right"><?php echo 'FS '.$btype; ?></td>
<td class="right"><?php echo 'Node '.$btype; ?></td>
<?php } ?>
@@ -204,7 +204,7 @@
<td class="data-right"><?php printf('%s/%s',$vo->READ_ERRORS,$vo->WRITE_ERRORS); ?></td>
<td class="data-right"><?php echo $vo->display('EST_CAPACITY_MB'); ?></td>
<td class="data-right"><?php echo $vo->display('PCT_RECLAIM'); ?></td>
<?php foreach (Kohana::config('config.tsmdatatypes') as $btype => $ctype) { ?>
<?php foreach (Kohana::$config->load('config')->tsmdatatypes as $btype => $ctype) { ?>
<td class="data-right"><?php echo $vo->getFSOnVol($ctype); ?></td>
<td class="data-right"><?php echo $vo->getNodesOnVol($ctype); ?></td>
<?php } ?>