Skip to content

Commit 02bf997

Browse files
tbrehmtbrehm
committed
Merged revisions 3028-3045 from stable branch.
1 parent ee260d7 commit 02bf997

File tree

326 files changed

+1672
-1083
lines changed

Some content is hidden

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

326 files changed

+1672
-1083
lines changed

‎install/dist/conf/opensuse112.conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
$conf['web']['apps_vhost_group'] = 'ispapps';
9898

9999
//* Fastcgi
100-
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
100+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/';
101101
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
102102

103103
//* Postfix

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ public function configure_database() {
158158
$this->error('Stopped: Database already contains some tables.');
159159
} else {
160160
if($conf['mysql']['admin_password'] == '') {
161-
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
161+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
162162
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
163163
} else {
164-
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
164+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
165165
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
166166
}
167167
$db_tables = $this->db->getTables();

‎install/lib/update.lib.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ function prepareDBDump() {
3333
//** load the pre update sql script do perform modifications on the database before the database is dumped
3434
if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
3535
if($conf['mysql']['admin_password'] == '') {
36-
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
36+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
3737
} else {
38-
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
38+
caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
3939
}
4040
}
4141

4242
//** export the current database data
4343
if( !empty($conf["mysql"]["admin_password"]) ) {
4444

45-
system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
45+
system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
4646
}
4747
else {
4848

49-
system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
49+
system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
5050
}
5151

5252
/*
@@ -69,9 +69,9 @@ function prepareDBDump() {
6969
if ($conf['powerdns']['installed']) {
7070
//** export the current PowerDNS database data
7171
if( !empty($conf["mysql"]["admin_password"]) ) {
72-
system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
72+
system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
7373
} else {
74-
system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
74+
system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
7575
}
7676

7777
// create a backup copy of the PowerDNS database in the root folder
@@ -90,7 +90,7 @@ function checkDbHealth() {
9090
$notok = array();
9191

9292
echo "Checking ISPConfig database .. ";
93-
exec("mysqlcheck -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -r ".$conf["mysql"]["database"], $result);
93+
exec("mysqlcheck -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -r ".escapeshellarg($conf["mysql"]["database"]), $result);
9494
for( $i=0; $i<sizeof($result);$i++) {
9595
if ( substr($result[$i], -2) != "OK" ) {
9696
$notok[] = $result[$i];
@@ -155,9 +155,9 @@ function updateDbAndIni() {
155155
if(is_file($patch_filename)) {
156156
//* Load patch file into database
157157
if( !empty($conf["mysql"]["admin_password"]) ) {
158-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
158+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename);
159159
} else {
160-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
160+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename);
161161
}
162162
swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
163163
$current_db_version = $next_db_version;
@@ -193,9 +193,9 @@ function updateDbAndIni() {
193193

194194
//** load old data back into database
195195
if( !empty($conf["mysql"]["admin_password"]) ) {
196-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
196+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < existing_db.sql");
197197
} else {
198-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
198+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < existing_db.sql");
199199
}
200200

201201
//** Get the database version number based on the patchfile
@@ -228,9 +228,9 @@ function updateDbAndIni() {
228228

229229
//** load old data back into the PowerDNS database
230230
if( !empty($conf["mysql"]["admin_password"]) ) {
231-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
231+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['powerdns']['database'])." < existing_powerdns_db.sql");
232232
} else {
233-
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
233+
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['powerdns']['database'])." < existing_powerdns_db.sql");
234234
}
235235
}
236236
}

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh
2+
Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -1970,6 +1970,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
19701970
-- Dumping data for table `sys_config`
19711971
--
19721972

1973-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.3');
1973+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.4');
19741974

19751975
SET FOREIGN_KEY_CHECKS = 1;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
3+
Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without modification,
@@ -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.3');
59+
define('ISPC_APP_VERSION', '3.0.4.4');
6060
define('DEVSYSTEM', 0);
6161

6262

@@ -146,7 +146,7 @@ $conf['software_updates_enabled'] = false;
146146
//** Themes
147147
$conf['theme'] = 'default';
148148
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
149-
$conf['logo'] = 'themes/default/images/ispc_logo.png';
149+
$conf['logo'] = 'themes/default/images/header_logo.png';
150150

151151
//** Default Language and Timezone
152152
$conf['language'] = '{language}';

‎interface/lib/app.inc.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,14 @@ public function tpl_defaults() {
216216
$this->tpl->setVar('app_version', '');
217217
}
218218
$this->tpl->setVar('app_link', $this->_conf['app_link']);
219+
/*
219220
if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
220221
$this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
221222
} else {
222223
$this->tpl->setVar('app_logo', '&nbsp;');
223224
}
225+
*/
226+
$this->tpl->setVar('app_logo', $this->_conf['logo']);
224227

225228
$this->tpl->setVar('phpsessid', session_id());
226229

‎interface/lib/classes/simplepie.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12151,7 +12151,7 @@ function set_query($query)
1215112151
}
1215212152
else
1215312153
{
12154-
$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?');
12154+
$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?&=');
1215512155
}
1215612156
$this->valid[__FUNCTION__] = true;
1215712157
return true;

‎interface/lib/config.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
//** Themes
132132
$conf['theme'] = 'default';
133133
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
134-
$conf['logo'] = 'themes/default/images/ispc_logo.png';
134+
$conf['logo'] = 'themes/default/images/header_logo.png';
135135

136136
//** Templates
137137
$conf['templates'] = '/usr/local/ispconfig/server/conf';

‎interface/lib/lang/ar.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Nov';
6969
$wb['monthnamesshort_dec'] = 'Dec';
7070
$wb['logout_txt'] = 'LOGOUT';
7171
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
72+
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
7273
?>

‎interface/lib/lang/bg.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ $wb['monthnamesshort_nov'] = 'Nov';
6969
$wb['monthnamesshort_dec'] = 'Dec';
7070
$wb['logout_txt'] = 'LOGOUT';
7171
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
72+
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
7273
?>

0 commit comments

Comments
 (0)