diff --git a/application/controllers/DumpController.php b/application/controllers/DumpController.php
index 6992570..0d1c633 100644
--- a/application/controllers/DumpController.php
+++ b/application/controllers/DumpController.php
@@ -27,12 +27,10 @@ class DumpController extends Msd_Controller_Action
{
$dump = new Msd_Dump();
$dump->prepareDumpProcess();
- $this->view->dumpData = new StdClass();
- $this->view->dumpData->nrOfDatabasesToBackup =
- count($dump->dbsToBackup);
- $this->view->dumpData->databasesToBackup =
- implode(', ', array_keys($dump->dbsToBackup));
- $this->view->dumpData->sumTotal = $dump->sumTotal;
+ $this->view->dumpData = new StdClass();
+ $this->view->dumpData->nrOfDatabasesToBackup = count($dump->dbsToBackup);
+ $this->view->dumpData->databasesToBackup = implode(', ', array_keys($dump->dbsToBackup));
+ $this->view->dumpData->sumTotal = $dump->sumTotal;
//TODO get comment from config profile
$this->view->dumpData->comment = '';
}
@@ -44,8 +42,8 @@ class DumpController extends Msd_Controller_Action
*/
public function startDumpAction()
{
- $taskList = Msd_TaskManager::getInstance('backupTasks');
- $tasks = $taskList->getTasks();
+ $taskList = Msd_TaskManager::getInstance('backupTasks');
+ $tasks = $taskList->getTasks();
$this->view->sessionId = Zend_Session::getId();
}
@@ -59,11 +57,10 @@ class DumpController extends Msd_Controller_Action
Zend_Layout::getMvcInstance()->disableLayout();
Zend_Controller_Front::getInstance()->setParam('noViewRenderer', true);
$taskList = Msd_TaskManager::getInstance('backupTasks');
- $tasks = $taskList->getTasks();
- $ret = array(
+ $tasks = $taskList->getTasks();
+ $ret = array(
'backup_in_progress' => false,
- 'config_file' => $this->view->dynamicConfig->getParam('configFile')
-
+ 'config_file' => $this->view->dynamicConfig->getParam('configFile')
);
echo json_encode($ret);
}
diff --git a/application/views/helpers/GetIcon.php b/application/views/helpers/GetIcon.php
index 4ad8f5c..9e75430 100644
--- a/application/views/helpers/GetIcon.php
+++ b/application/views/helpers/GetIcon.php
@@ -20,9 +20,11 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
/**
* Get html-img-tag for icon image
*
- * @param string $name
- * @param string $title
- * @param int $size
+ * @throws Msd_Exception
+ *
+ * @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
*/
@@ -32,7 +34,7 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
if (!$baseUrl) {
$baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
}
- $icons = self::_getIconFilenames();
+ $icons = $this->_getIconFilenames();
if (!isset($icons[$name])) {
throw new Msd_Exception(
'GetIcon: unknown icon \'' . $name . '\' requested'
diff --git a/application/views/scripts/dump/settings.phtml b/application/views/scripts/dump/settings.phtml
index b199621..7152ec2 100644
--- a/application/views/scripts/dump/settings.phtml
+++ b/application/views/scripts/dump/settings.phtml
@@ -1,113 +1,113 @@
parent->dumpData;
-$sumTotal = $this->parent->dumpData->sumTotal;
-$this->lang = $this->parent->lang;
+$d = $this->parent->dumpData;
+$sumTotal = $this->parent->dumpData->sumTotal;
+$this->lang = $this->parent->lang;
$this->config = $this->parent->config;
?>
-
lang->L_FM_DUMPSETTINGS;?>
-
-
- lang->L_CONFIG_HEADLINE?> |
- dynamicConfig->getParam('configFile')?> |
-
-
- lang->L_DBS?>: |
-
- databasesToBackup?> (nrOfDatabasesToBackup?>)
- |
-
-
- lang->L_TABLES?>: |
- numberFormat($sumTotal['tablesTotal'])?>
- |
-
-
- lang->L_RECORDS?>: |
- numberFormat($sumTotal['recordsTotal'])?> |
-
-
- lang->L_DATASIZE?>: |
- byteOutput($sumTotal['datasizeTotal'])?> |
-
-
-
- (lang->L_DATASIZE_INFO?>.)
- |
-
-
-
- lang->L_GZIP?>: |
- dynamicConfig->getParam('compression') ? $this->lang->L_YES: $this->lang->L_NO; ?> |
-
-
-partial('dump/multipart.phtml', array('parent' => $this->parent));
-echo $this->partial('dump/email.phtml', array('parent' => $this->parent));
-echo $this->partial('dump/ftp.phtml', array('parent' => $this->parent));
-
-?>
-
-
-
-
- lang->L_TABLE_TYPE;?> |
- '.$tableType.'';
- }
- ?>
- lang->L_INFO_SUM;?> |
+ lang->L_FM_DUMPSETTINGS;?>
+
+
+ lang->L_CONFIG_HEADLINE?> |
+ config->getParam('general.title')?> |
+
+
+ lang->L_DBS?>: |
+
+ databasesToBackup?> (nrOfDatabasesToBackup?>)
+ |
- lang->L_TABLES;?>: |
- lang->L_TABLES?>:
+ numberFormat($sumTotal['tablesTotal'])?>
+ |
+
+
+ lang->L_RECORDS?>: |
+ numberFormat($sumTotal['recordsTotal'])?> |
+
+
+ lang->L_DATASIZE?>: |
+ byteOutput($sumTotal['datasizeTotal'])?> |
+
+
+
+ (lang->L_DATASIZE_INFO?>.)
+ |
+
+
+
+ lang->L_GZIP?>: |
+ dynamicConfig->getParam('compression') ? $this->lang->L_YES : $this->lang->L_NO; ?> |
+
+
+ partial('dump/multipart.phtml', array('parent' => $this->parent));
+ echo $this->partial('dump/email.phtml', array('parent' => $this->parent));
+ echo $this->partial('dump/ftp.phtml', array('parent' => $this->parent));
+
+ ?>
+
+
+
+
+ lang->L_TABLE_TYPE;?> |
+ ' . $tableType . '';
+ }
+ ?>
+ lang->L_INFO_SUM;?> |
+
+
+ lang->L_TABLES;?>: |
+ '
- .$this->numberFormat($details[$tableType]['tablesTotal'])
- .'';
+ . $this->numberFormat($details[$tableType]['tablesTotal'])
+ . '';
$tablesTotal += $details[$tableType]['tablesTotal'];
}
- ?>
-
- numberFormat($tablesTotal);?>
- |
-
-
- lang->L_RECORDS;?>: |
-
+
+ numberFormat($tablesTotal);?>
+ |
+
+
+ lang->L_RECORDS;?>: |
+ '
- .$this->numberFormat($details[$tableType]['recordsTotal'])
- .'';
+ . $this->numberFormat($details[$tableType]['recordsTotal'])
+ . '';
$recordsTotal += $details[$tableType]['recordsTotal'];
}
- ?>
-
- numberFormat($recordsTotal);?>
- |
-
-
- lang->L_DATASIZE;?>: |
-
+
+ numberFormat($recordsTotal);?>
+ |
+
+
+ lang->L_DATASIZE;?>: |
+ '
- .$this->byteOutput($details[$tableType]['datasizeTotal'])
- .'';
+ . $this->byteOutput($details[$tableType]['datasizeTotal'])
+ . '';
$datasizeTotal += $details[$tableType]['datasizeTotal'];
}
- ?>
-
- byteOutput($datasizeTotal);?>
- |
-
-
-
+ ?>
+
+ byteOutput($datasizeTotal);?>
+ |
+
+
+