Skip to content

Commit edf806b

Browse files
tbrehmtbrehm
committed
Merged revisions 2741-2788 from SVN stable branch.
1 parent ecf891a commit edf806b

File tree

228 files changed

+887
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+887
-542
lines changed

‎install/apps/bastille-firewall‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
### END INIT INFO
5959

6060

61-
REALSCRIPT=/sbin/bastille-ipchains
61+
REALSCRIPT=/sbin/bastille-netfilter
6262
PATH=/sbin:/bin:/usr/sbin:/usr/bin
6363

6464
# exit function to be called in place of regular Bourne exit
@@ -78,13 +78,6 @@ if [ $? -ne 0 ]; then
7878
exit 1
7979
fi
8080

81-
if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then
82-
# We are using Linux 2.3 or newer; use the netfilter script if available
83-
if [ -x /sbin/bastille-netfilter ]; then
84-
REALSCRIPT=/sbin/bastille-netfilter
85-
fi
86-
fi
87-
8881
if [ ! -x ${REALSCRIPT} ]; then
8982
echo "ERROR: \"${REALSCRIPT}\" not available!"
9083
clean_exit 1

‎install/autoupdate.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
die("internal error - MYSQL-Root passord not known");
145145
}
146146

147+
//** Test mysql root connection
148+
if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
149+
die("internal error - MYSQL-Root passord wrong");
150+
}
151+
147152
/*
148153
* Check all tables
149154
*/
@@ -156,7 +161,6 @@
156161

157162
//* initialize the database
158163
$inst->db = new db();
159-
$inst->db->dbName = $conf["mysql"]["database"];
160164

161165
/*
162166
* The next line is a bit tricky!

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,11 @@ public function install_ispconfig()
10291029
// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
10301030
replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0);
10311031

1032+
if(is_file($install_dir.'/interface/invoices')) {
1033+
chmod($install_dir.'/interface/invoices', 0770);
1034+
chown($install_dir.'/interface/invoices', 'ispconfig');
1035+
chgrp($install_dir.'/interface/invoices', 'ispconfig');
1036+
}
10321037

10331038
}
10341039

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,12 @@ public function install_ispconfig()
866866
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
867867
}
868868

869+
if(is_file($install_dir.'/interface/invoices')) {
870+
chmod($install_dir.'/interface/invoices', 0770);
871+
chown($install_dir.'/interface/invoices', 'ispconfig');
872+
chgrp($install_dir.'/interface/invoices', 'ispconfig');
873+
}
874+
869875
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
870876
// and must be fixed as this will allow the apache user to read the ispconfig files.
871877
// Later this must run as own apache server or via suexec!

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,12 @@ public function install_ispconfig()
10601060
exec('chmod 744 /usr/local/bin/run-getmail.sh');
10611061
}
10621062

1063+
if(is_file($install_dir.'/interface/invoices')) {
1064+
chmod($install_dir.'/interface/invoices', 0770);
1065+
chown($install_dir.'/interface/invoices', 'ispconfig');
1066+
chgrp($install_dir.'/interface/invoices', 'ispconfig');
1067+
}
1068+
10631069

10641070
}
10651071

‎install/lib/install.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ function removeLine($filename,$search_pattern,$strict = 0) {
582582
}
583583

584584
function is_installed($appname) {
585-
exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
586-
if(isset($out[0]) && stristr($out[0],$appname)) {
585+
exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
586+
if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
587587
return true;
588588
} else {
589589
return false;

‎install/lib/installer_base.lib.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,10 @@ public function configure_jailkit() {
514514
copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
515515
copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
516516
}
517+
518+
//* help jailkit fo find its ini files
519+
if(!is_link('/usr/jk_socketd.ini')) exec('ln -s /etc/jailkit/jk_socketd.ini /usr/jk_socketd.ini');
520+
if(!is_link('/usr/jk_init.ini')) exec('ln -s /etc/jailkit/jk_init.ini /usr/jk_init.ini');
517521

518522
}
519523

@@ -903,7 +907,7 @@ public function configure_dovecot() {
903907
if(is_file($config_dir.'/'.$configfile)) {
904908
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
905909
}
906-
chmod($config_dir.'/'.$configfile.'~', 0400);
910+
if(is_file($config_dir.'/'.$configfile.'~')) chmod($config_dir.'/'.$configfile.'~', 0400);
907911
$content = rf('tpl/debian_dovecot-sql.conf.master');
908912
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
909913
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
@@ -1758,6 +1762,12 @@ public function install_ispconfig() {
17581762
chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
17591763
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
17601764
}
1765+
1766+
if(is_file($install_dir.'/interface/invoices')) {
1767+
chmod($install_dir.'/interface/invoices', 0770);
1768+
chown($install_dir.'/interface/invoices', 'ispconfig');
1769+
chgrp($install_dir.'/interface/invoices', 'ispconfig');
1770+
}
17611771

17621772
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
17631773
// and must be fixed as this will allow the apache user to read the ispconfig files.
@@ -1952,7 +1962,7 @@ public function configure_dbserver() {
19521962
wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
19531963
chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
19541964
chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
1955-
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
1965+
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
19561966

19571967
}
19581968

‎install/lib/update.lib.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function updateDbAndIni() {
113113
$ini_array = ini_to_array(stripslashes($tmp['config']));
114114
$current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
115115

116-
if(count($ini_array) == 0) die('Unable to read server configuration from database.');
116+
if(!is_array($ini_array) or count($ini_array) == 0) die('Unable to read server configuration from database.');
117117

118118
$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
119119
$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
@@ -231,7 +231,7 @@ function updateDbAndIni() {
231231

232232

233233
//** Update server ini
234-
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
234+
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
235235
$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
236236
unset($tmp_server_rec);
237237
$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
@@ -286,15 +286,15 @@ function updateDbAndIni() {
286286
}
287287

288288
$new_ini = array_to_ini($tpl_ini_array);
289-
$sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
289+
$sql = "UPDATE ".$conf["mysql"]["database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
290290
$inst->db->query($sql);
291291
unset($old_ini_array);
292292
unset($tpl_ini_array);
293293
unset($new_ini);
294294

295295

296296
//** Update system ini
297-
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
297+
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".sys_ini WHERE sysini_id = 1");
298298
$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
299299
unset($tmp_server_rec);
300300
$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
@@ -309,11 +309,11 @@ function updateDbAndIni() {
309309
}
310310

311311
$new_ini = array_to_ini($tpl_ini_array);
312-
$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
312+
$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM '.$conf["mysql"]["database"].'.sys_ini WHERE 1');
313313
if($tmp['number'] == 0) {
314-
$inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
314+
$inst->db->query("INSERT INTO ".$conf["mysql"]["database"].".sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
315315
} else {
316-
$inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
316+
$inst->db->query("UPDATE ".$conf["mysql"]["database"].".sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
317317
}
318318
unset($old_ini_array);
319319
unset($tpl_ini_array);

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1919,6 +1919,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
19191919
-- Dumping data for table `sys_config`
19201920
--
19211921

1922-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4');
1922+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.1');
19231923

19241924
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/config.inc.php.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.0.4');
59+
define('ISPC_APP_VERSION', '3.0.4.1');
6060
define('DEVSYSTEM', 0);
6161

6262

0 commit comments

Comments
 (0)