Skip to content

Commit 671f79d

Browse files
author
Florian Schaal
committed
2 parents e59fe36 + be531cf commit 671f79d

File tree

10 files changed

+40
-5
lines changed

10 files changed

+40
-5
lines changed

‎install/dist/lib/centos52.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public function configure_amavis() {
123123
$content = str_replace('{hostname}', $conf['hostname'], $content);
124124
$content = str_replace('/var/spool/amavisd/clamd.sock', '/tmp/clamd.socket', $content);
125125
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
126+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
126127

127128

128129
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/centos53.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public function configure_amavis() {
124124
$content = str_replace('{hostname}', $conf['hostname'], $content);
125125
$content = str_replace('/var/spool/amavisd/clamd.sock', '/var/run/clamav/clamd.sock', $content);
126126
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
127+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
127128

128129

129130
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/centos70.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public function configure_amavis() {
124124
$content = str_replace('{hostname}', $conf['hostname'], $content);
125125
$content = str_replace('/var/spool/amavisd/clamd.sock', '/var/run/clamav/clamd.sock', $content);
126126
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
127+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
127128

128129

129130
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/fedora.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ public function configure_amavis() {
522522
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
523523
$content = str_replace('{hostname}', $conf['hostname'], $content);
524524
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
525+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
525526

526527

527528
// Adding the amavisd commands to the postfix configuration
@@ -1326,7 +1327,12 @@ public function install_ispconfig()
13261327

13271328
// Add symlink for patch tool
13281329
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
1329-
1330+
1331+
// Change mode of a few files from amavisd
1332+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1333+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1334+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1335+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
13301336
}
13311337
}
13321338

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,13 @@ public function install_ispconfig()
11891189

11901190
// Add symlink for patch tool
11911191
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
1192-
1192+
1193+
// Change mode of a few files from amavisd
1194+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1195+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1196+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1197+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
1198+
11931199
}
11941200

11951201
}

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ public function configure_amavis() {
570570
$content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
571571
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
572572
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
573+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
573574

574575

575576
// Adding the amavisd commands to the postfix configuration
@@ -1399,7 +1400,12 @@ public function install_ispconfig()
13991400

14001401
// Add symlink for patch tool
14011402
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
1402-
1403+
1404+
// Change mode of a few files from amavisd
1405+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1406+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1407+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1408+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
14031409

14041410
}
14051411

‎install/lib/install.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ function get_distname() {
8686
$mainver = array_filter($mainver);
8787
$mainver = current($mainver).'.'.next($mainver);
8888
switch ($mainver){
89+
case "15.04":
90+
$relname = "(Vivid Vervet)";
91+
break;
8992
case "14.10":
9093
$relname = "(Utopic Unicorn)";
9194
break;

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,14 +1099,15 @@ public function configure_amavis() {
10991099
// amavisd user config file
11001100
$configfile = 'amavisd_user_config';
11011101
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].'/50-user~');
1102-
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user~', 0400);
1102+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
11031103
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
11041104
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
11051105
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
11061106
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
11071107
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
11081108
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
11091109
wf($conf['amavis']['config_dir'].'/conf.d/50-user', $content);
1110+
chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
11101111

11111112
// TODO: chmod and chown on the config file
11121113

@@ -2380,6 +2381,13 @@ public function install_ispconfig() {
23802381
// Add symlink for patch tool
23812382
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
23822383

2384+
// Change mode of a few files from amavisd
2385+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
2386+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
2387+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
2388+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
2389+
2390+
23832391
}
23842392

23852393
public function configure_dbserver() {

‎interface/web/capp.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444

4545
if(!preg_match("/^[a-z]{2,20}$/i", $mod)) die('module name contains unallowed chars.');
46-
if($redirect != '' && !preg_match("/^[a-z0-9]+\/[a-z0-9_\.\-]+\?id=[0-9]{1,7}$/i", $redirect)) die('redirect contains unallowed chars.');
46+
if($redirect != '' && !preg_match("/^[a-z0-9]+\/[a-z0-9_\.\-]+\?id=[0-9]{1,9}$/i", $redirect)) die('redirect contains unallowed chars.');
4747

4848
//* Check if user may use the module.
4949
$user_modules = explode(",", $_SESSION["s"]["user"]["modules"]);

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public function get_distname() {
6262
$mainver = array_filter($mainver);
6363
$mainver = current($mainver).'.'.next($mainver);
6464
switch ($mainver){
65+
case "15.04":
66+
$relname = "(Vivid Vervet)";
67+
break;
6568
case "14.10":
6669
$relname = "(Utopic Unicorn)";
6770
break;

0 commit comments

Comments
 (0)