Skip to content

Commit 738c3d4

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/admin/lib/lang/de_system_config.lng
2 parents ba5d831 + b34f99d commit 738c3d4

File tree

16 files changed

+96
-82
lines changed

16 files changed

+96
-82
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,14 +1167,14 @@ public function install_ispconfig()
11671167
//exec('chmod +r /var/log/clamav/freshclam.log');
11681168

11691169
//* Install the update script
1170-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
1171-
exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1172-
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1170+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
1171+
exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh');
1172+
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh');
11731173
exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
11741174
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
11751175
exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
11761176
exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
1177-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
1177+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
11781178
if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
11791179

11801180
// set the fast cgi starter script to executable

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,19 +1014,19 @@ public function install_ispconfig()
10141014
}
10151015

10161016
//* Install the update script
1017-
if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) {
1018-
unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
1017+
if (is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) {
1018+
unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
10191019
}
10201020

1021-
chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
1022-
chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
1021+
chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
1022+
chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
10231023
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
10241024
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
10251025
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
10261026
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
10271027

1028-
if (!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) {
1029-
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
1028+
if (!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) {
1029+
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
10301030
}
10311031

10321032
if (!is_link('/usr/local/bin/ispconfig_update.sh')) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,14 +1218,14 @@ public function install_ispconfig()
12181218
//exec('chmod +r /var/log/clamav/freshclam.log');
12191219

12201220
//* Install the update script
1221-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
1222-
exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1223-
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1221+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
1222+
exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh');
1223+
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh');
12241224
exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
12251225
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
12261226
exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
12271227
exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
1228-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
1228+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
12291229
if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
12301230

12311231
//set the fast cgi starter script to executable

‎install/lib/install.lib.php‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -692,43 +692,6 @@ function is_installed($appname) {
692692
}
693693
}
694694

695-
/*
696-
* Compare ISPConfig version number.
697-
* return values:
698-
* -1 $current version is newer then $new version (downgrade)
699-
* 0 $current version = $new version
700-
* 1 $current version is older then new version (update)
701-
702-
*/
703-
function compare_ispconfig_version($current, $new) {
704-
if( $current == $new) {
705-
return 0;
706-
}
707-
708-
$p = explode('.', $current);
709-
$tmp = '';
710-
$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
711-
$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
712-
$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
713-
$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
714-
$current = $tmp;
715-
716-
$p = explode('.', $new);
717-
$tmp = '';
718-
$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
719-
$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
720-
$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
721-
$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
722-
$new = $tmp;
723-
724-
if($new > $current) {
725-
return 1;
726-
} else {
727-
return -1;
728-
}
729-
730-
}
731-
732695
/*
733696
* Get the port number of the ISPConfig controlpanel vhost
734697
*/

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,14 +2035,14 @@ public function install_ispconfig() {
20352035
}
20362036

20372037
//* Install the update script
2038-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
2039-
chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
2040-
chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
2038+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
2039+
chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
2040+
chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
20412041
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
20422042
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
20432043
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
20442044
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
2045-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
2045+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
20462046
if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
20472047

20482048
//* Make the logs readable for the ispconfig user

‎install/lib/update.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ function updateDbAndIni() {
153153
$conf['nginx']['installed'] = false;
154154
}
155155

156-
//* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
157-
if(compare_ispconfig_version('3.0.3', ISPC_APP_VERSION) >= 0) {
156+
//* Do incremental DB updates only on installed ISPConfig versions >= 3.0.3
157+
if(version_compare('3.0.3', ISPC_APP_VERSION, '<=')) {
158158

159159
swriteln($inst->lng('Starting incremental database update.'));
160160

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@
317317
),
318318
'smtp_crypt' => array (
319319
'datatype' => 'VARCHAR',
320-
'formtype' => 'CHECKBOX',
321-
'default' => 'n',
322-
'value' => array(0 => 'n', 1 => 'y')
320+
'formtype' => 'SELECT',
321+
'default' => '',
322+
'value' => array('' => 'No', 'ssl' => 'SSL', 'tls' => 'STARTTLS')
323323
),
324324
//#################################
325325
// ENDE Datatable fields

‎interface/web/admin/lib/lang/de_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,5 @@ $wb['customer_no_start_txt'] = 'Kundennummer Startwert';
6868
$wb['customer_no_counter_txt'] = 'Kundennummer Zähler';
6969
$wb['session_timeout_txt'] = 'Session-Timeout (Minuten)';
7070
$wb['session_allow_endless_txt'] = '"Eingeloggt bleiben" aktivieren';
71+
$wb['No'] = 'Nein';
7172
?>

‎interface/web/admin/lib/lang/en_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ $wb['customer_no_start_txt'] = 'Customer No. start value';
7070
$wb['customer_no_counter_txt'] = 'Customer No. counter';
7171
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
7272
$wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
73+
$wb['No'] = 'No';
7374
?>

‎interface/web/admin/templates/system_config_mail_edit.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
8080
<input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
8181
</div>
8282
<div class="ctrlHolder">
83-
<p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
84-
<div class="multiField">
83+
<label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
84+
<select name="smtp_crypt" id="smtp_crypt" class="selectInput formLengthHalf">
8585
{tmpl_var name='smtp_crypt'}
86-
</div>
86+
</select>
8787
</div>
8888
</fieldset>
8989

0 commit comments

Comments
 (0)