1
0
Fork 0
Dieser Commit ist enthalten in:
DSB 2012-11-05 19:30:10 +00:00
Ursprung bf306fb369
Commit a85629f43c
3 geänderte Dateien mit 106 neuen und 107 gelöschten Zeilen

Datei anzeigen

@ -28,10 +28,8 @@ class DumpController extends Msd_Controller_Action
$dump = new Msd_Dump(); $dump = new Msd_Dump();
$dump->prepareDumpProcess(); $dump->prepareDumpProcess();
$this->view->dumpData = new StdClass(); $this->view->dumpData = new StdClass();
$this->view->dumpData->nrOfDatabasesToBackup = $this->view->dumpData->nrOfDatabasesToBackup = count($dump->dbsToBackup);
count($dump->dbsToBackup); $this->view->dumpData->databasesToBackup = implode(', ', array_keys($dump->dbsToBackup));
$this->view->dumpData->databasesToBackup =
implode(', ', array_keys($dump->dbsToBackup));
$this->view->dumpData->sumTotal = $dump->sumTotal; $this->view->dumpData->sumTotal = $dump->sumTotal;
//TODO get comment from config profile //TODO get comment from config profile
$this->view->dumpData->comment = ''; $this->view->dumpData->comment = '';
@ -63,7 +61,6 @@ class DumpController extends Msd_Controller_Action
$ret = array( $ret = array(
'backup_in_progress' => false, 'backup_in_progress' => false,
'config_file' => $this->view->dynamicConfig->getParam('configFile') 'config_file' => $this->view->dynamicConfig->getParam('configFile')
); );
echo json_encode($ret); echo json_encode($ret);
} }

Datei anzeigen

@ -20,9 +20,11 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
/** /**
* Get html-img-tag for icon image * Get html-img-tag for icon image
* *
* @param string $name * @throws Msd_Exception
* @param string $title *
* @param int $size * @param string $name Icon name
* @param string $title HTML title tag
* @param int $size Size in Pixel (defines the sub folder to load from)
* *
* @return string * @return string
*/ */
@ -32,7 +34,7 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
if (!$baseUrl) { if (!$baseUrl) {
$baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
} }
$icons = self::_getIconFilenames(); $icons = $this->_getIconFilenames();
if (!isset($icons[$name])) { if (!isset($icons[$name])) {
throw new Msd_Exception( throw new Msd_Exception(
'GetIcon: unknown icon \'' . $name . '\' requested' 'GetIcon: unknown icon \'' . $name . '\' requested'

Datei anzeigen

@ -9,7 +9,7 @@ $this->config = $this->parent->config;
<table class="bdr floatLeft" summary="Dump settings"> <table class="bdr floatLeft" summary="Dump settings">
<tr class="row-even"> <tr class="row-even">
<td class="small"><?php echo $this->lang->L_CONFIG_HEADLINE?></td> <td class="small"><?php echo $this->lang->L_CONFIG_HEADLINE?></td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('configFile')?></td> <td class="small right"><?php echo $this->config->getParam('general.title')?></td>
</tr> </tr>
<tr class="dbrow"> <tr class="dbrow">
<td class="small"><?php echo $this->lang->L_DBS?>:</td> <td class="small"><?php echo $this->lang->L_DBS?>:</td>