Index: branches/5.2.x/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r14699 -r14707 --- branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14699) +++ branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14707) @@ -1,6 +1,6 @@ getBackupFiles(); + $backup_helper =& $this->Application->recallObject('BackupHelper'); + /* @var $backup_helper BackupHelper */ - foreach ($datearray as $value) { - $params['backuptimestamp'] = $value['filedate']; - $params['backuptime'] = date('F j, Y, g:i a', $value['filedate']); - $params['backupsize'] = round($value['filesize'] / 1024 / 1024, 2); // MBytes + $ret = ''; + $dates = $backup_helper->getBackupFiles(); + + foreach ($dates as $date) { + $params['backuptimestamp'] = $date['filedate']; + $params['backuptime'] = date('F j, Y, g:i a', $date['filedate']); + $params['backupsize'] = round($date['filesize'] / 1024 / 1024, 2); // MBytes + $ret .= $this->Application->ParseBlock($params); } return $ret; } - function getBackupFiles() - { - $file_helper =& $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ - - $ret = Array (); - $backup_path = $this->Application->ConfigValue('Backup_Path'); - $file_helper->CheckFolder($backup_path); - $backup_files = glob($backup_path . DIRECTORY_SEPARATOR . 'dump*.txt'); - - if ( !$backup_files ) { - return Array (); - } - - foreach ($backup_files as $backup_file) { - $ret[] = Array ( - 'filedate' => preg_replace('/^dump([\d]+)\.txt$/', '\\1', basename($backup_file)), - 'filesize' => filesize($backup_file) - ); - } - - rsort($ret); - - return $ret; - - } - /** * Returns phpinfo() output *