1
0
Fork 0

Continued to switch the old configuration handling to the new one.

Dieser Commit ist enthalten in:
DSB 2012-08-04 17:09:48 +00:00
Ursprung 025b5c339d
Commit ae87af916f
54 geänderte Dateien mit 501 neuen und 269 gelöschten Zeilen

Datei anzeigen

@ -6,7 +6,7 @@ $this->lang = $this->parent->lang;
<td class="small"><?php echo $this->lang->L_SEND_MAIL_FORM?>:</td>
<td class="small right">
<?php
if ($this->config->get('config.email.sendMail') == 0) {
if ($this->config->getParam('email.sendMail') == 0) {
echo $this->lang->L_NO;
} else {
echo $this->lang->L_YES;

Datei anzeigen

@ -2,9 +2,10 @@
$this->config = $this->parent->config;
$this->lang = $this->parent->lang;
if (count($this->config->get('config.ftp'))>0) {
$ftpConfigurations = $this->config->getParam('ftp');
if (count($ftpConfigurations) > 0) {
$ftpNr = 1;
foreach ($this->config->get('config.ftp') as $ftp) {
foreach ($ftpConfigurations as $ftp) {
if ($ftp['use'] == 'y') {
?>
<tr class="row-even">

Datei anzeigen

@ -54,7 +54,7 @@ $d = $this->dumpData;
</td>
</tr>
<?php if ($this->config->get('config.mode') > 0) { ?>
<?php if ($this->config->getParam('mode', 0) > 0) { ?>
<tr class="row-odd">
<td><label for="backup_using_updates">Update (REPLACE Command):</label></td>
<td><input type="checkbox" class="checkbox noleftmargin" name="backup_using_updates" id="backup_using_updates" value="1" /></td>
@ -76,10 +76,14 @@ $d = $this->dumpData;
</div>
<br />
<?php
echo $this->partial('dump/settings.phtml',array('parent' => $this));
echo $this->partial('dump/settings.phtml', array(
'parent' => $this,
'config' => $this->config,
'dynamicConfig' => $this->dynamicConfig)
);
?>
<div id="panel_perl" class="panel" style="display:none">
<h3><?php echo $this->lang->L_DUMP?> PERL (<?php echo $this->lang->L_CONFIG_HEADLINE;?>: <?php echo $this->config->get('dynamic.configFile')?>)</h3>
<h3><?php echo $this->lang->L_DUMP?> PERL (<?php echo $this->lang->L_CONFIG_HEADLINE;?>: <?php echo $this->dynamicConfig->getParam('configFile');?>)</h3>
<button class="Formbutton" name="DoCronscript" onclick="show_perl_output('<?php echo $d->PERL_HTTP_CALL?>')"><?php echo $this->lang->L_DOCRONBUTTON?></button>
<button class="Formbutton" name="DoSimpleTest" onclick="show_perl_output('<?php echo $d->PERL_TEST?>')"><?php echo $this->lang->L_DOSIMPLETEST?></button>
<button class="Formbutton" name="DoPerlTest" onclick="show_perl_output('<?php echo PERL_MODULTEST?>')"><?php echo $this->lang->L_DOPERLTEST?></button>

Datei anzeigen

@ -2,7 +2,7 @@
$this->config = $this->parent->config;
$this->lang = $this->parent->lang;
$d = $this->parent->dumpData;
if ($this->config->get('config.general.multiPart') == 0) { ?>
if ($this->config->getParam('general.multiPart') == 0) { ?>
<tr class="row-odd">
<td class="small"><?php echo $this->lang->L_MULTI_PART?>:</td>
<td class="small right" colspan="2"><?php echo $this->lang->L_NO?></td>
@ -16,4 +16,4 @@ if ($this->config->get('config.general.multiPart') == 0) { ?>
<td class="small">&nbsp;&nbsp;<?php echo $this->lang->L_MULTIPART_SIZE?>:</td>
<td class="small right"><?php echo$this->byteOutput($this->config->multipartGroesse);?></td>
</tr>
<?php }
<?php }

Datei anzeigen

@ -9,7 +9,7 @@ $this->config = $this->parent->config;
<table class="bdr floatLeft" summary="Dump settings">
<tr class="row-even">
<td class="small"><?php echo $this->lang->L_CONFIG_HEADLINE?></td>
<td class="small right"><?php echo $this->config->get('dynamic.configFile')?></td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('configFile')?></td>
</tr>
<tr class="dbrow">
<td class="small"><?php echo $this->lang->L_DBS?>:</td>
@ -38,7 +38,7 @@ $this->config = $this->parent->config;
<tr class="dbrow">
<td class="small nowrap"><?php echo $this->lang->L_GZIP?>:</td>
<td class="small right"><?php echo $this->config->get('dynamic.compression') ? $this->lang->L_YES: $this->lang->L_NO; ?></td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('compression') ? $this->lang->L_YES: $this->lang->L_NO; ?></td>
</tr>
<?php
@ -110,4 +110,4 @@ if (!empty($sumTotal['tables'])) {
</tr>
</table>
<?php } ?>
</div>
</div>

Datei anzeigen

@ -102,7 +102,7 @@ $(document).ready( function () {
<td class="small"><?php echo $this->lang->L_CONFIG;?>:</td>
<td class="small right">
<span id="config_file">
<?php echo $this->config->get('dynamic.configFile')?>
<?php echo $this->dynamicConfig->getParam('configFile')?>
</span>
</td>
</tr>
@ -274,4 +274,4 @@ $(document).ready( function () {
<h3><?php echo $this->lang->L_LOG;?>:</h3>
<div id="log" class="bdr small" style="height:100px;overflow:auto;" onmouseover="scroll_log=false" onmouseout="scroll_log=true"></div>
</div>
<br /><br />
<br /><br />