From cab7ea5faaa2f3510c8488e7d19d083fc05ac6ca Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 18 Sep 2013 04:17:27 -0400
Subject: [PATCH] - Fixed missing global $app in new _decode function
---
install/dist/lib/debian60.lib.php | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 88ba5d2..e1be291 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -86,18 +86,26 @@
//* Copy dovecot configuration file
if($dovecot_version == 2) {
- copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
+ if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master')) {
+ copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile);
+ } else {
+ copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
+ }
} else {
- copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
+ if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
+ copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master', $config_dir.'/'.$configfile);
+ } else {
+ copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
+ }
}
//* dovecot-sql.conf
$configfile = 'dovecot-sql.conf';
if(is_file($config_dir.'/'.$configfile)){
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
+ chmod($config_dir.'/'.$configfile.'~', 0400);
}
- chmod($config_dir.'/'.$configfile.'~', 0400);
- $content = rf('tpl/debian6_dovecot-sql.conf.master');
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot-sql.conf.master', 'tpl/debian6_dovecot-sql.conf.master');
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
@@ -126,4 +134,4 @@
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1