| {tmpl_var name="domain"} |
{tmpl_var name="system_user"} |
- {tmpl_var name="used"} |
- {tmpl_var name="soft"} |
- {tmpl_var name="hard"} |
+ {tmpl_var name="used"} |
+ {tmpl_var name="soft"} |
+ {tmpl_var name="hard"} |
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1f707ab066dc4e03b72d94eaea0d07df9d1c7726..11285e66d289b3975924500c2b2592d796384568 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -106,9 +106,9 @@ function getClientID($dataRecord) {
function convertClientName($name){
/**
- * only allow 'a'..'z', '_', '-', '0'..'9'
+ * only allow 'a'..'z', '_', '0'..'9'
*/
- $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_-';
+ $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_';
$res = '';
$name = strtolower(trim($name));
for ($i=0; $i < strlen($name); $i++){
diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php
index 2e28d0d62179b78c835ea6dd909a44e33fb0a6cc..0109dc9d9ae0048faa23c27d5c85d868abf64acf 100644
--- a/interface/web/sites/user_quota_stats.php
+++ b/interface/web/sites/user_quota_stats.php
@@ -17,8 +17,16 @@ $app->auth->check_module_permissions('sites');
$app->load('listform_actions');
-$tmp_rec = $app->db->queryOneRecord("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
-$monitor_data = unserialize($app->db->unquote($tmp_rec['data']));
+// $tmp_rec = $app->db->queryOneRecord("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
+// $monitor_data = unserialize($app->db->unquote($tmp_rec['data']));
+$tmp_rec = $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
+$monitor_data = array();
+if(is_array($tmp_rec)) {
+ foreach ($tmp_rec as $tmp_mon) {
+ $monitor_data = array_merge_recursive($monitor_data,unserialize($app->db->unquote($tmp_mon['data'])));
+ }
+}
+
class list_action extends listform_actions {
@@ -33,12 +41,38 @@ class list_action extends listform_actions {
$rec['bgcolor'] = $this->DataRowColor;
$username = $rec['system_user'];
- $rec['used'] = (is_numeric($monitor_data['user'][$username]['used'])) ? round($monitor_data['user'][$username]['used']/1024) .'MB' : $monitor_data['user'][$username]['used'].'B';
- $rec['soft'] = $monitor_data['user'][$username]['soft'].'B';
- $rec['hard'] = $monitor_data['user'][$username]['hard'].'B';
+ $rec['used'] = $monitor_data['user'][$username]['used'];
+ $rec['soft'] = $monitor_data['user'][$username]['soft'];
+ $rec['hard'] = $monitor_data['user'][$username]['hard'];
+
+ if($rec['used'] > 1024) {
+ $rec['used'] = round($rec['used'] / 1024,2).' MB';
+ } else {
+ $rec['used'] .= ' KB';
+ }
+
+ if($rec['soft'] > 1024) {
+ $rec['soft'] = round($rec['soft'] / 1024,2).' MB';
+ } else {
+ $rec['soft'] .= ' KB';
+ }
+
+ if($rec['hard'] > 1024) {
+ $rec['hard'] = round($rec['hard'] / 1024,2).' MB';
+ } else {
+ $rec['hard'] .= ' KB';
+ }
+
+
+
+ /*
+ if(!strstr($rec['used'],'M') && !strstr($rec['used'],'K')) $rec['used'].= ' B';
+ if(!strstr($rec['soft'],'M') && !strstr($rec['soft'],'K')) $rec['soft'].= ' B';
+ if(!strstr($rec['hard'],'M') && !strstr($rec['hard'],'K')) $rec['hard'].= ' B';
+ */
- if($rec['soft'] == '0K') $rec['soft'] = $app->lng('unlimited');
- if($rec['hard'] == '0K') $rec['hard'] = $app->lng('unlimited');
+ if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited');
+ if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited');
//* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key];
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index cf07f2a93c677ece180f9b345a1a6d651e96ee98..31469399ab6a0e3e71e979e2b249768679aef91f 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -426,6 +426,10 @@ class page_action extends tform_actions {
if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').' ';
if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').' ';
}
+
+ if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') {
+ if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').' ';
+ }
}
diff --git a/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng
new file mode 100644
index 0000000000000000000000000000000000000000..f95fc2d6aa619dfea9a3dd196d018f0874d0ed07
--- /dev/null
+++ b/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng
@@ -0,0 +1,9 @@
+
+
diff --git a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
index 0aacc6073a48e4f88b1d62e9a9ba5cd9e6fe6c8d..d8ccab671a35b5a77dbd6c500cef2da34173de76 100644
--- a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng
@@ -9,3 +9,4 @@ $wb['password_strength_5_txt'] = 'Heel sterk';
+
diff --git a/interface/web/themes/default/css/screen/basemod.css b/interface/web/themes/default/css/screen/basemod.css
index 13b006a59d05d411fdfc8ebc886e450753058537..9498535505561569d6ed7a2f39fbec217af68d5b 100644
--- a/interface/web/themes/default/css/screen/basemod.css
+++ b/interface/web/themes/default/css/screen/basemod.css
@@ -37,7 +37,13 @@
/* (de) Layout: Breite, Hintergrund, Rahmen */
/*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/
/* #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}*/
- #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}
+
+ /*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers,
+ This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the
+ display: table; attribute correctly*/
+ #page_margins { min-width: 980px; max-width: 80%; background: #fff;}
+ /*#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}*/
+
#page{ padding: 10px; }
/* (en) Designing main layout elements */
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index d27f64ff4bd247739679073e5fc3aba7af431bcd..160b2d6d7b47baab219cbb3098f854aad3c03c8c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -58,6 +58,14 @@
+
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index 20923820e5864dea38e216ff3831a9ab0f415aaf..63d0fce78836b0f3dce625f8c126717c881c2e8c 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -59,6 +59,14 @@
+
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 6bcf70d53d312933c818cd614cdb5f5aab8a401c..31e2b854940a37d2f1a052a16985c0300aa1e100 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -59,6 +59,14 @@
+
diff --git a/interface/web/tools/lib/lang/id.lng b/interface/web/tools/lib/lang/id.lng
new file mode 100644
index 0000000000000000000000000000000000000000..f357814f796981b46a5ecfad2660098bd064cfa9
--- /dev/null
+++ b/interface/web/tools/lib/lang/id.lng
@@ -0,0 +1,7 @@
+
+
diff --git a/interface/web/tools/lib/lang/id_usersettings.lng b/interface/web/tools/lib/lang/id_usersettings.lng
new file mode 100644
index 0000000000000000000000000000000000000000..0f69cac2044bcc2dc054aab2499dd669166f3fa8
--- /dev/null
+++ b/interface/web/tools/lib/lang/id_usersettings.lng
@@ -0,0 +1,9 @@
+
+
diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng
index 70dd45b69563e2cc5b01a0f20e81ce1d60330dfa..180e9de80f988afafb75d1ed68955e0c938e3f92 100644
--- a/interface/web/tools/lib/lang/nl.lng
+++ b/interface/web/tools/lib/lang/nl.lng
@@ -6,3 +6,4 @@ $wb['Password and Language'] = 'Wachtwoord en taal';
?>
+
diff --git a/interface/web/tools/lib/lang/nl_usersettings.lng b/interface/web/tools/lib/lang/nl_usersettings.lng
index dfdfc943c2ed841888b27abb50a5dbcc98858c8b..e765c6c478a01368d6686b362495a07dc6d9a551 100644
--- a/interface/web/tools/lib/lang/nl_usersettings.lng
+++ b/interface/web/tools/lib/lang/nl_usersettings.lng
@@ -9,3 +9,4 @@ $wb["Settings"] = 'Instellingen';
+
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 752c8bff2ff7cc98171c96d83a4c0eca317647d2..42d86aef6279fffb6ead51c41324b19329fde8fb 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -40,6 +40,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Order allow,deny
Allow from all
+
Alias /awstats-icon "/usr/share/awstats/icon"
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index db03e77dfdb4f7e2f4cb45ad317764a74f7151a0..89b0931f4e02a88d16cd54344c92bb1e8c969767 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -150,15 +150,46 @@
# php as fast-cgi enabled
- # SocketPath /tmp/fcgid_sock/
+
+ # SocketPath /tmp/fcgid_sock/
+
+ # IdleTimeout n (3600 seconds)
+ # An idle fastcgi application will be terminated after IdleTimeout seconds.
IdleTimeout 3600
+
+ # ProcessLifeTime n (7200 seconds)
+ # A fastcgi application will be terminated if lifetime expired, even no error is detected.
ProcessLifeTime 7200
+
+ # MaxProcessCount n (1000)
+ # The max count of total fastcgi process count.
# MaxProcessCount 1000
- DefaultMinClassProcessCount 3
+
+ # DefaultMinClassProcessCount n (3)
+ # The minimum number of fastcgi application instances for any one fastcgi application.
+ # Idle fastcgi will not be killed if their count is less than n
+ # Set this to 0, and tweak IdleTimeout
+ DefaultMinClassProcessCount 0
+
+ # DefaultMaxClassProcessCount n (100)
+ # The maximum number of fastcgi application instances allowed to run for
+ # particular one fastcgi application.
DefaultMaxClassProcessCount 100
+
+ # IPCConnectTimeout n (3 seconds)
+ # The connect timeout to a fastcgi application.
IPCConnectTimeout 8
+
+ # IPCCommTimeout n (20 seconds)
+ # The communication timeout to a fastcgi application. Please increase this
+ # value if your CGI have a slow initialization or slow respond.
IPCCommTimeout 360
- BusyTimeout 300
+
+ # BusyTimeout n (300 seconds)
+ # A fastcgi application will be terminated if handing a single request
+ # longer than busy timeout.
+ BusyTimeout 300
+
AddHandler fcgid-script .php .php3 .php4 .php5
@@ -348,14 +379,43 @@
# php as fast-cgi enabled
# SocketPath /tmp/fcgid_sock/
+ # IdleTimeout n (3600 seconds)
+ # An idle fastcgi application will be terminated after IdleTimeout seconds.
IdleTimeout 3600
+
+ # ProcessLifeTime n (7200 seconds)
+ # A fastcgi application will be terminated if lifetime expired, even no error is detected.
ProcessLifeTime 7200
+
+ # MaxProcessCount n (1000)
+ # The max count of total fastcgi process count.
# MaxProcessCount 1000
- DefaultMinClassProcessCount 3
+
+ # DefaultMinClassProcessCount n (3)
+ # The minimum number of fastcgi application instances for any one fastcgi application.
+ # Idle fastcgi will not be killed if their count is less than n
+ # Set this to 0, and tweak IdleTimeout
+ DefaultMinClassProcessCount 0
+
+ # DefaultMaxClassProcessCount n (100)
+ # The maximum number of fastcgi application instances allowed to run for
+ # particular one fastcgi application.
DefaultMaxClassProcessCount 100
+
+ # IPCConnectTimeout n (3 seconds)
+ # The connect timeout to a fastcgi application.
IPCConnectTimeout 8
+
+ # IPCCommTimeout n (20 seconds)
+ # The communication timeout to a fastcgi application. Please increase this
+ # value if your CGI have a slow initialization or slow respond.
IPCCommTimeout 360
- BusyTimeout 300
+
+ # BusyTimeout n (300 seconds)
+ # A fastcgi application will be terminated if handing a single request
+ # longer than busy timeout.
+ BusyTimeout 300
+
AddHandler fcgid-script .php .php3 .php4 .php5
diff --git a/server/cron_daily.php b/server/cron_daily.php
index e9aedac20abe86323b0abe961267eac6334c71fd..e3fc5be3333c059672b6f28830ba2e0e13dd6047 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -295,7 +295,7 @@ if ($app->dbmaster == $app->db) {
$maxId = $res['max(action_id)'];
$sql = "DELETE FROM sys_remoteaction " .
"WHERE tstamp < " . $tstamp . " " .
- " AND action_status = 'ok' " .
+ " AND action_state = 'ok' " .
" AND action_id <" . intval($maxId);
$app->dbmaster->query($sql);
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 1d5579ece0502fd98c4b782537d4db2fa9157863..5de2f8150433b54410bb8bb63b86e22d99f989b5 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1157,9 +1157,11 @@ class system{
if($found == 0) {
//* add \n if the last line does not end with \n or \r
- if(substr($out,-1) != "\n" && substr($out,-1) != "\r") $out .= "\n";
+ if(substr($out,-1) != "\n" && substr($out,-1) != "\r" && filesize($filename) > 0) $out .= "\n";
//* add the new line at the end of the file
- if($append == 1) $out .= $new_line."\n";
+ if($append == 1) {
+ $out .= $new_line."\n";
+ }
}
file_put_contents($filename,$out);
}
@@ -1198,8 +1200,8 @@ class system{
$user = escapeshellcmd($user);
// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
$group = $user;
- chown($dir,$user);
- chgrp($dir,$group);
+ if(is_dir($dir)) chown($dir,$user);
+ if(is_dir($dir)) chgrp($dir,$group);
$chown_mdsub = true;
}
@@ -1207,7 +1209,7 @@ class system{
$maildirsubs = array('cur','new','tmp');
foreach ($maildirsubs as $mdsub) {
- mkdir($dir.'/'.$mdsub, 0700, true);
+ if(!is_dir($dir.'/'.$mdsub)) mkdir($dir.'/'.$mdsub, 0700, true);
if ($chown_mdsub) {
chown($dir.'/'.$mdsub, $user);
chgrp($dir.'/'.$mdsub, $group);
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 4555387d868959ee0c4206180ec05132e4ef34ce..43928121ecb9ad66ade31d28f29e7a6a5828166b 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -238,7 +238,7 @@ class monitor_core_module {
$state = 'ok';
/** Fetch the data for all users*/
- $dfData = shell_exec('repquota -asu');
+ $dfData = shell_exec('repquota -au');
// split into array
$df = explode("\n", $dfData);
@@ -253,14 +253,22 @@ class monitor_core_module {
*/
$s = preg_split ('/[\s]+/', $df[$i]);
$username = $s[0];
- $data['user'][$username]['used'] = $s[2];
- $data['user'][$username]['soft'] = $s[3];
- $data['user'][$username]['hard'] = $s[4];
+ if(substr($username,0,3) == 'web') {
+ if(isset($data['user'][$username])) {
+ $data['user'][$username]['used'] += $s[2];
+ $data['user'][$username]['soft'] += $s[3];
+ $data['user'][$username]['hard'] += $s[4];
+ } else {
+ $data['user'][$username]['used'] = $s[2];
+ $data['user'][$username]['soft'] = $s[3];
+ $data['user'][$username]['hard'] = $s[4];
+ }
+ }
}
}
/** Fetch the data for all users*/
- $dfData = shell_exec('repquota -asg');
+ $dfData = shell_exec('repquota -ag');
// split into array
$df = explode("\n", $dfData);
@@ -275,9 +283,17 @@ class monitor_core_module {
*/
$s = preg_split ('/[\s]+/', $df[$i]);
$groupname = $s[0];
- $data['group'][$groupname]['used'] = $s[1];
- $data['group'][$groupname]['soft'] = $s[2];
- $data['group'][$groupname]['hard'] = $s[3];
+ if(substr($groupname,0,6) == 'client') {
+ if(isset($data['group'][$groupname])) {
+ $data['group'][$groupname]['used'] += $s[1];
+ $data['group'][$groupname]['soft'] += $s[2];
+ $data['group'][$groupname]['hard'] += $s[3];
+ } else {
+ $data['group'][$groupname]['used'] = $s[1];
+ $data['group'][$groupname]['soft'] = $s[2];
+ $data['group'][$groupname]['hard'] = $s[3];
+ }
+ }
}
}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index d8941a8eb6d2f94483b3b161b5e9f99c5b9600e3..fbdfd732f939dc9253c94c89bce379976a3b62a2 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -155,15 +155,15 @@ class apache2_plugin {
}
//* Save a SSL certificate to disk
- if($data['new']['ssl_action'] == 'save') {
- $ssl_dir = $data['new']['document_root'].'/ssl';
- $domain = $data['new']['ssl_domain'];
- $csr_file = $ssl_dir.'/'.$domain.'.csr';
- $crt_file = $ssl_dir.'/'.$domain.'.crt';
- $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
- file_put_contents($csr_file,$data['new']['ssl_request']);
- file_put_contents($crt_file,$data['new']['ssl_cert']);
- if(trim($data['new']['ssl_bundle']) != '') file_put_contents($bundle_file,$data['new']['ssl_bundle']);
+ if($data["new"]["ssl_action"] == 'save') {
+ $ssl_dir = $data["new"]["document_root"]."/ssl";
+ $domain = $data["new"]["ssl_domain"];
+ $csr_file = $ssl_dir.'/'.$domain.".csr";
+ $crt_file = $ssl_dir.'/'.$domain.".crt";
+ $bundle_file = $ssl_dir.'/'.$domain.".bundle";
+ if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]);
+ if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]);
+ if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
/* Update also the master-DB of the Server-Farm */
@@ -553,7 +553,11 @@ class apache2_plugin {
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
} else {
- $master_php_ini_path = $web_config['php_ini_path_cgi'];
+ if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
+ $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+ } else {
+ $master_php_ini_path = $web_config['php_ini_path_cgi'];
+ }
}
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
$php_ini_content .= file_get_contents($master_php_ini_path)."\n";
@@ -890,6 +894,9 @@ class apache2_plugin {
$app->log('Apache status is: '.$apache_online_status_before_restart,LOGLEVEL_DEBUG);
$app->services->restartService('httpd','restart');
+
+ // wait a few seconds, before we test the apache status again
+ sleep(2);
//* Check if apache restarted successfully if it was online before
$apache_online_status_after_restart = $this->_checkTcp('localhost',80);
@@ -911,7 +918,7 @@ class apache2_plugin {
}
// Remove the backup copy of the config file.
- unlink($vhost_file.'~');
+ if(@is_file($vhost_file.'~')) unlink($vhost_file.'~');
//* Unset action to clean it for next processed vhost.
@@ -1255,8 +1262,13 @@ class apache2_plugin {
*/
$fn = substr($file, 0, strlen($file) - strlen('.htdigest'));
$output .= "\n";
+<<<<<<< .working
$output .= " Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
$output .= " \n";
+=======
+ $output .= " Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
+ $output .= " \n";
+>>>>>>> .merge-right.r2129
$output .= " DAV On\n";
$output .= " AuthType Digest\n";
$output .= " AuthName \"" . $fn . "\"\n";
|