Continued to switch the old configuration handling to the new one.
Dieser Commit ist enthalten in:
Ursprung
025b5c339d
Commit
ae87af916f
54 geänderte Dateien mit 501 neuen und 269 gelöschten Zeilen
|
|
@ -19,8 +19,6 @@ class Msd_View_Helper_GetConfigTitle extends Zend_View_Helper_Abstract
|
|||
{
|
||||
public function getConfigTitle($configName)
|
||||
{
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$configData = $config->loadConfiguration($configName, false);
|
||||
return $configData->general->title;
|
||||
return $this->view->config->getConfigTitle($configName);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
|
|||
*/
|
||||
public function getIcon($name, $title='', $size='')
|
||||
{
|
||||
//return true;
|
||||
static $baseUrl = false;
|
||||
if (!$baseUrl) {
|
||||
$baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
|
||||
|
|
@ -38,13 +39,12 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
|
|||
'GetIcon: unknown icon \''.$name .'\' requested'
|
||||
);
|
||||
}
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$img = '<img src="'.$baseUrl.'/%s/%s" alt="%s" title="%s" />';
|
||||
if ($size>'') {
|
||||
$img = '<img src="'.$baseUrl.'/%s/%sx%s/%s" alt="%s" title="%s" />';
|
||||
$ret = sprintf(
|
||||
$img,
|
||||
$config->get('paths.iconpath'),
|
||||
$this->view->config->getParam('paths.iconPath'),
|
||||
$size,
|
||||
$size,
|
||||
$icons[$name],
|
||||
|
|
@ -53,7 +53,7 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
|
|||
} else {
|
||||
$ret = sprintf(
|
||||
$img,
|
||||
$config->get('paths.iconpath'),
|
||||
$this->view->config->getParam('paths.iconPath'),
|
||||
$icons[$name],
|
||||
$title,
|
||||
$title
|
||||
|
|
@ -71,10 +71,10 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
|
|||
{
|
||||
static $icons = false;
|
||||
if (!$icons) {
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$config = $this->view->config;
|
||||
$file = realpath(
|
||||
APPLICATION_PATH . '/../public/'
|
||||
. $config->get('paths.iconpath') . '/icon.ini'
|
||||
. $config->getParam('paths.iconPath') . '/icon.ini'
|
||||
);
|
||||
$iconsIni = new Zend_Config_Ini($file, 'icons');
|
||||
$icons = $iconsIni->toArray();
|
||||
|
|
|
|||
|
|
@ -37,20 +37,20 @@ class Msd_View_Helper_GetIconSrc extends Zend_View_Helper_Abstract
|
|||
'GetIconSrc: unknown icon \''.$name . '\' requested'
|
||||
);
|
||||
}
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$config = Msd_Registry::getConfig();
|
||||
$img = $baseUrl.'/%s/%s';
|
||||
if ($size>'') {
|
||||
$img = $baseUrl.'/%s/%sx%s/%s';
|
||||
$ret = sprintf(
|
||||
$img,
|
||||
$config->get('paths.iconpath'),
|
||||
$config->getParam('paths.iconPath'),
|
||||
$size,
|
||||
$size,
|
||||
$icons[$name]
|
||||
);
|
||||
} else {
|
||||
$ret = sprintf(
|
||||
$img, $config->get('paths.iconpath'), $icons[$name]
|
||||
$img, $config->getParam('paths.iconPath'), $icons[$name]
|
||||
);
|
||||
}
|
||||
return $ret;
|
||||
|
|
@ -65,10 +65,10 @@ class Msd_View_Helper_GetIconSrc extends Zend_View_Helper_Abstract
|
|||
{
|
||||
static $icons = false;
|
||||
if (!$icons) {
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$config = Msd_Registry::getConfig();
|
||||
$file = realpath(
|
||||
APPLICATION_PATH . '/../public/'
|
||||
. $config->get('paths.iconpath') . '/icon.ini'
|
||||
. $config->getParam('paths.iconPath') . '/icon.ini'
|
||||
);
|
||||
$iconsIni = new Zend_Config_Ini($file, 'icons');
|
||||
$icons = $iconsIni->toArray();
|
||||
|
|
|
|||
|
|
@ -53,15 +53,15 @@ class Msd_View_Helper_Menu extends Zend_View_Helper_Abstract
|
|||
*/
|
||||
private function _getDatabases()
|
||||
{
|
||||
$actualDb = $this->view->config->get('dynamic.dbActual');
|
||||
$databases = $this->view->config->get('dynamic.databases');
|
||||
$actualDb = $this->view->dynamicConfig->getParam('dbActual');
|
||||
$databases = $this->view->dynamicConfig->getParam('databases', array());
|
||||
$dbo = Msd_Db::getAdapter();
|
||||
if (empty($databases) || $dbo->selectDb($actualDb) !== true) {
|
||||
// couldn't connect to db - refresh db-list
|
||||
$databases = $dbo->getDatabaseNames();
|
||||
// if database was deleted or is not accessible by user
|
||||
// fallback to default db
|
||||
$defaultDb = $this->view->config->get('config.dbuser.defaultDb');
|
||||
$defaultDb = $this->view->config->getParam('dbuser.defaultDb');
|
||||
if ($defaultDb != '') {
|
||||
$actualDb = $defaultDb;
|
||||
if ($dbo->selectDb($actualDb) !== true) {
|
||||
|
|
@ -70,8 +70,8 @@ class Msd_View_Helper_Menu extends Zend_View_Helper_Abstract
|
|||
$dbo->selectDb($actualDb);
|
||||
}
|
||||
}
|
||||
$this->view->config->set('dynamic.dbActual', $actualDb);
|
||||
$this->view->config->set('dynamic.databases', $databases);
|
||||
$this->view->dynamicConfig->setParam('dbActual', $actualDb);
|
||||
$this->view->dynamicConfig->setParam('databases', $databases);
|
||||
}
|
||||
return $databases;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -167,8 +167,7 @@ class Msd_View_Helper_PopUpMessage extends Zend_View_Helper_Abstract
|
|||
*/
|
||||
private function _getDefaultPosition()
|
||||
{
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$position = $config->get('config.interface.notificationWindowPosition');
|
||||
$position = $this->view->config->getParam('interface.notificationWindowPosition');
|
||||
if (isset($this->_positions[$position])) {
|
||||
$position = $this->_positions[$position];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
$version = new Msd_Version();
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$config = Msd_Registry::getConfig();
|
||||
$lang = Msd_Language::getInstance();
|
||||
$theme = $config->get('config.interface.theme');
|
||||
$language = $config->get('config.interface.language');
|
||||
$theme = $config->getParam('interface.theme');
|
||||
$language = $config->getParam('interface.language');
|
||||
$this->headMeta()->appendHttpEquiv('content-language', $language);
|
||||
$this->headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=utf-8')
|
||||
->appendHttpEquiv('expires', 'Wed, 26 Feb 1997 08:21:57 GMT')
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
<?php
|
||||
$version = new Msd_Version();
|
||||
$config = Msd_Configuration::getInstance();
|
||||
$config = Msd_Registry::getConfig();
|
||||
$lang = Msd_Language::getInstance();
|
||||
$theme = $config->get('config.interface.theme'); //@todo why theme?
|
||||
$language = $config->get('config.interface.language');
|
||||
$theme = $config->getParam('interface.theme'); //@todo why theme?
|
||||
$language = $config->getParam('interface.language');
|
||||
$this->headMeta()->appendHttpEquiv('content-language', $language);
|
||||
$this->headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=utf-8')
|
||||
->appendHttpEquiv('expires', 'Wed, 26 Feb 1997 08:21:57 GMT')
|
||||
|
|
@ -47,4 +46,4 @@ $messages = (string) $this->popUpMessage();
|
|||
echo $this->layout()->content;
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ $t = Msd_Language::getInstance()->getTranslator();
|
|||
<?php
|
||||
foreach ($this->databases as $db) {
|
||||
echo '<option value="'.base64_encode($db).'"';
|
||||
if ($db == $this->config->get('dynamic.dbActual')) {
|
||||
if ($db == $this->dynamicConfig->getParam('dbActual')) {
|
||||
echo ' selected="selected"';
|
||||
}
|
||||
echo '>'.$db.'</option>';
|
||||
|
|
@ -173,7 +173,7 @@ $t = Msd_Language::getInstance()->getTranslator();
|
|||
$this->configFiles = Msd_File::getConfigNames();
|
||||
foreach ($this->configFiles as $file) {
|
||||
echo "\n" . '<option value="' . base64_encode($file) . '"';
|
||||
if ($this->config->get('dynamic.configFile') == $file) {
|
||||
if ($this->dynamicConfig->getParam('configFile') == $file) {
|
||||
echo ' selected="selected"';
|
||||
}
|
||||
echo '>'.$this->getConfigTitle($file).'</option>';
|
||||
|
|
|
|||
|
|
@ -109,11 +109,11 @@
|
|||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
$dbs = $this->config->get('config.databases');
|
||||
$dbs = $this->config->getParam('databases');
|
||||
echo $this->partial(
|
||||
'config/databases/listDbs.phtml',
|
||||
array('databases' => $dbs,
|
||||
'dbActual' => $this->config->get('dynamic.dbActual'),
|
||||
'dbActual' => $this->dynamicConfig->getParam('dbActual'),
|
||||
'parent' => $this,
|
||||
)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -189,8 +189,8 @@ $testFtpConnectionUrl = $this->url(
|
|||
</script>
|
||||
|
||||
<div id="content">
|
||||
<h2><?php echo $this->lang->L_CONFIG_HEADLINE;?>: <?php echo $this->config->get('dynamic.configFile');?>
|
||||
<span class="small">(<?php echo $this->lang->L_MSD_MODE;?>: <?php echo $this->config->get('config.general.mode');?>)</span></h2>
|
||||
<h2><?php echo $this->lang->L_CONFIG_HEADLINE;?>: <?php echo $this->dynamicConfig->getParam('configFile');?>
|
||||
<span class="small">(<?php echo $this->lang->L_MSD_MODE;?>: <?php echo $this->config->getParam('general.mode');?>)</span></h2>
|
||||
<form method="post" action="<?php
|
||||
echo $this->url(
|
||||
array(
|
||||
|
|
@ -254,7 +254,7 @@ echo $this->url(
|
|||
|
||||
<script type="text/javascript">
|
||||
/* <![CDATA[ */
|
||||
<?php if (count((array) $this->config->get('dynamic.databases')) == 0): ?>
|
||||
<?php if (count((array) $this->dynamicConfig->getParam('databases')) == 0): ?>
|
||||
mySlideDown('connection-params');
|
||||
<?php endif; ?>
|
||||
/*]]>*/
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"> <?php echo $this->lang->L_MULTIPART_SIZE?>:</td>
|
||||
<td class="small right"><?php echo$this->byteOutput($this->config->multipartGroesse);?></td>
|
||||
</tr>
|
||||
<?php }
|
||||
<?php }
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 />
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ $version = new Msd_Version();
|
|||
</head>
|
||||
<body>
|
||||
<?php
|
||||
if ($this->displayErrors == 1) {
|
||||
//if ($this->displayErrors == 1) {
|
||||
?>
|
||||
<h1>An error occurred</h1>
|
||||
<h2><?php echo $this->message ?></h2>
|
||||
|
|
@ -47,7 +47,7 @@ if ($this->displayErrors == 1) {
|
|||
<pre><?php echo var_export($this->request->getParams(), true) ?>
|
||||
</pre>
|
||||
<?php endif;
|
||||
}
|
||||
//}
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</a>
|
||||
<br />
|
||||
<h3><?php echo $this->lang->L_VERSIONSINFORMATIONEN;?></h3>
|
||||
<img src="<?php echo $this->baseUrl();?>/css/<?php echo $this->config->get('config.interface.theme');?>/pics/loveyourdata.gif"
|
||||
<img src="<?php echo $this->baseUrl();?>/css/<?php echo $this->config->getParam('interface.theme');?>/pics/loveyourdata.gif"
|
||||
style="float:right;padding-left:10px;" alt="love your data" title="love your data" />
|
||||
<table class="bdr" summary="Version information">
|
||||
<tr class="row-even">
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<td><?php echo $this->lang->L_MEMORY;?>:</td>
|
||||
<td>
|
||||
<strong>
|
||||
<?php echo $this->byteOutput($this->config->get('dynamic.phpRam')*1024*1024, 0);?>
|
||||
<?php echo $this->byteOutput($this->dynamicConfig->getParam('phpRam')*1024*1024, 0);?>
|
||||
</strong>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<td>
|
||||
<strong><?php echo $this->serverMaxExecutionTime;?>
|
||||
<?php echo $this->lang->L_SECONDS;?>
|
||||
(<?php echo $this->config->get('dynamic.maxExecutionTime');?>
|
||||
(<?php echo $this->dynamicConfig->getParam('maxExecutionTime');?>
|
||||
<?php echo $this->lang->L_SECONDS;?>)
|
||||
</strong>
|
||||
</td>
|
||||
|
|
@ -49,9 +49,9 @@
|
|||
|
||||
<tr class="row-odd">
|
||||
<td><?php echo $this->lang->L_PHP_EXTENSIONS;?>:</td>
|
||||
<td class="small"><?php echo $this->config->get('dynamic.phpextensions');?>
|
||||
<td class="small"><?php echo $this->dynamicConfig->getParam('phpExtensions');?>
|
||||
<?php
|
||||
if (!$this->config->get('dynamic.compression')) { ?>
|
||||
if (!$this->dynamicConfig->getParam('compression')) { ?>
|
||||
<br /><span class="error"><?php echo $this->lang->L_NOGZPOSSIBLE;?></span>
|
||||
<?php }
|
||||
if (!extension_loaded('ftp')) { ?>
|
||||
|
|
@ -59,10 +59,10 @@
|
|||
<?php } ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php if ($this->config->get('dynamic.disabledPhpFunctions') > '') { ?>
|
||||
<?php if ($this->dynamicConfig->getParam('disabledPhpFunctions') > '') { ?>
|
||||
<tr class="row-even nowrap">
|
||||
<td><?php echo $this->lang->L_DISABLEDFUNCTIONS;?>:</td>
|
||||
<td class="small"><?php echo $this->config->get('dynamic.disabledPhpFunctions');?></td>
|
||||
<td class="small"><?php echo $this->dynamicConfig->getParam('disabledPhpFunctions');?></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
</table>
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
</tr>
|
||||
<tr class="row-odd">
|
||||
<td><?php echo $this->lang->L_INFO_ACTDB;?>:</td>
|
||||
<td><strong><?php echo $this->config->get('dynamic.dbActual');?></strong></td>
|
||||
<td><strong><?php echo $this->dynamicConfig->getParam('dbActual');?></strong></td>
|
||||
</tr>
|
||||
<tr class="row-even">
|
||||
<td><?php echo $this->lang->L_FM_FREESPACE;?>:</td>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
$theme = $this->config->get('config.interface.theme');
|
||||
$theme = $this->config->getParam('interface.theme', 'msd');
|
||||
$request = Zend_Controller_Front::getInstance()->getRequest();
|
||||
$this->controller = $request->getControllerName();
|
||||
$this->action = $request->getActionName();
|
||||
|
|
@ -41,7 +41,7 @@ $('#fadeMenuIn').click(function() {
|
|||
return false;
|
||||
});
|
||||
<?php
|
||||
if ($this->config->get('config.interface.showTooltips') == 'y') { ?>
|
||||
if ($this->config->getParam('interface.showTooltips') == 'y') { ?>
|
||||
SetupTooltips();
|
||||
<?php }
|
||||
$this->jQuery()->onLoadCaptureEnd();
|
||||
|
|
@ -58,11 +58,11 @@ $this->jQuery()->onLoadCaptureEnd();
|
|||
|
||||
<div id="version">
|
||||
<div id="fadeMenuOut" title="blend out menu">
|
||||
<img style="margin-left:6px;" src="<?php echo $this->baseUrl(); ?>/css/<?php echo$theme?>/icons/handLeft.png"
|
||||
<img style="margin-left:6px;" src="<?php echo $this->baseUrl(); ?>/css/<?php echo $theme?>/icons/handLeft.png"
|
||||
alt="<?php echo $this->lang->L_MENU_HIDE;?>" title="<?php echo $this->lang->L_MENU_HIDE;?>" />
|
||||
</div>
|
||||
<span class="version-line">Version <?php echo $this->msdVersion;?></span>
|
||||
<?php if ($this->config->get('config.general.mode') == 'easy') {?>
|
||||
<?php if ($this->config->getParam('general.mode') == 'easy') {?>
|
||||
<img src="<?php echo $this->baseUrl(); ?>/css/<?php echo$theme?>/pics/navi_bg.jpg" alt="" />
|
||||
<?php } else { ?>
|
||||
<img src="<?php echo $this->baseUrl(); ?>/css/<?php echo$theme?>/pics/navi_bg_expert.jpg" alt="" />
|
||||
|
|
@ -143,7 +143,7 @@ $this->jQuery()->onLoadCaptureEnd();
|
|||
$this->databases = $dbAdapter->getDatabaseNames();
|
||||
foreach ($this->databases as $db) {
|
||||
echo '<option value="'.base64_encode($db).'"';
|
||||
if ($db == $this->config->get('dynamic.dbActual')) {
|
||||
if ($db == $this->dynamicConfig->getParam('dbActual')) {
|
||||
echo ' selected="selected"';
|
||||
}
|
||||
echo '>'.$db.'</option>';
|
||||
|
|
@ -165,16 +165,16 @@ $this->jQuery()->onLoadCaptureEnd();
|
|||
$this->configFiles = Msd_File::getConfigNames();
|
||||
foreach ($this->configFiles as $file) {
|
||||
echo "\n" . '<option value="' . base64_encode($file) . '"';
|
||||
if ($this->config->get('dynamic.configFile') == $file) {
|
||||
if ($this->dynamicConfig->getParam('configFile') == $file) {
|
||||
echo ' selected="selected"';
|
||||
}
|
||||
echo '>'.$this->getConfigTitle($file).'</option>';
|
||||
echo '>'. $this->config->getConfigTitle($file) . '</option>';
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
</fieldset>
|
||||
</form>
|
||||
<?php if (in_array($this->config->get('config.interface.language'), array('de', 'ch'))) {; ?>
|
||||
<?php if (in_array($this->config->getParam('interface.language'), array('de', 'ch'))) {; ?>
|
||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
|
||||
<p style="text-align:center">
|
||||
<input type="image" src="<?php echo $this->baseUrl();?>/images/paypal-de.gif" name="submit" alt="Spende an MySQLDumper" />
|
||||
|
|
@ -198,7 +198,7 @@ $this->jQuery()->onLoadCaptureEnd();
|
|||
</div>
|
||||
|
||||
<?php
|
||||
if ($this->config->get('config.interface.showServerCaption') == "y") {
|
||||
if ($this->config->getParam('interface.showServerCaption') == "y") {
|
||||
?>
|
||||
<div id="server0">
|
||||
<?php echo$this->lang->L_SERVER;?>:
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
$systemDatabases = $this->config->get('config.systemDatabases');
|
||||
$systemDatabases = $this->config->getParam('systemDatabases');
|
||||
$formUrl = $this->url(array('controller'=>'sql','action'=>'index'));
|
||||
$cycleHelper = $this->getHelper('cycle')->cycle(array('row-even', 'row-odd'));
|
||||
?>
|
||||
<div id="content">
|
||||
<h2><?php echo $this->lang->L_DATABASES_OF_USER;?> '<?php echo $this->config->get('config.dbuser.user').'\'@\''.$this->config->get('config.dbuser.host');?>'</h2>
|
||||
<h2><?php echo $this->lang->L_DATABASES_OF_USER;?> '<?php echo $this->config->getParam('dbuser.user').'\'@\''.$this->config->getParam('dbuser.host');?>'</h2>
|
||||
<?php echo $this->sqlHeadNavi(); ?>
|
||||
<?php
|
||||
if (isset($this->actionResults)) {
|
||||
|
|
@ -100,7 +100,7 @@ if (isset($this->actionResults)) {
|
|||
?>
|
||||
<tr class="nowrap
|
||||
<?php
|
||||
if ($dbName == $this->config->get('dynamic.dbActual')) {
|
||||
if ($dbName == $this->dynamicConfig->getParam('dbActual')) {
|
||||
echo 'row-highlight';
|
||||
} else {
|
||||
echo $this->cycle(array('row-even', 'row-odd'))->next();
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ $this->jQuery()->javascriptCaptureStart(); ?>
|
|||
<a href="#">
|
||||
<?php
|
||||
echo $this->getIcon('Server', '', 16)
|
||||
. $this->config->get('config.dbuser.user') .'@'
|
||||
. $this->config->get('config.dbuser.host');
|
||||
$port = $this->config->get('config.dbuser.port');
|
||||
. $this->config->getParam('dbuser.user') .'@'
|
||||
. $this->config->getParam('dbuser.host');
|
||||
$port = $this->config->getParam('dbuser.port');
|
||||
if ($port > 0) {
|
||||
echo ':' . $port;
|
||||
}
|
||||
|
|
@ -34,11 +34,11 @@ $this->jQuery()->javascriptCaptureStart(); ?>
|
|||
<li>
|
||||
<a href="<?php echo $showDatabasesUrl;?>">
|
||||
<?php echo$this->getIcon('Database', '', 16);?>
|
||||
<?php echo $this->out($this->config->get('dynamic.dbActual'));?>
|
||||
<?php echo $this->out($this->dynamicConfig->getParam('dbActual'));?>
|
||||
</a>
|
||||
</li>
|
||||
<?php
|
||||
$actualTable = $this->config->get('dynamic.tableActual');
|
||||
$actualTable = $this->dynamicConfig->getParam('tableActual');
|
||||
if ($actualTable > '') {
|
||||
?>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ $('#sqltextarea').bind('keyup', function(e){
|
|||
<br class="clear" />
|
||||
</div>
|
||||
<div>
|
||||
<textarea style="height:<?php echo $this->config->get('config.interface.sqlboxHeight');?>px;" name="sqltextarea" id="sqltextarea" rows="4" cols="10"><?php echo $this->boxcontent;?></textarea>
|
||||
<textarea style="height:<?php echo $this->config->getParam('interface.sqlboxHeight');?>px;" name="sqltextarea" id="sqltextarea" rows="4" cols="10"><?php echo $this->boxcontent;?></textarea>
|
||||
<div class="sqlbox-warning small center"><?php echo $this->lang->L_SQL_WARNING;?></div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -130,4 +130,4 @@ if (isset($this->resultSummary)) {
|
|||
</table>
|
||||
<?php
|
||||
} ?>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div id="content">
|
||||
<h2><?php echo $this->lang->L_SQL_TABLESOFDB;?> `<?php echo $this->config->get('dynamic.dbActual');?>`
|
||||
<h2><?php echo $this->lang->L_SQL_TABLESOFDB;?> `<?php echo $this->dynamicConfig->getParam('dbActual');?>`
|
||||
</h2>
|
||||
<?php
|
||||
echo $this->sqlHeadNavi();
|
||||
|
|
|
|||
Laden …
Tabelle hinzufügen
Einen Link hinzufügen
In neuem Issue referenzieren