maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into redesign

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-09 10:54:31 +01:00
parent 80379232a9 460e153c6f
commit e13d588c07
3 changed files with 1515 additions and 1360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1739
lib/classes/idna/class.idna_convert.php
View File

File diff suppressed because it is too large Load Diff

16
scripts/jobs/cron_traffic.php
View File

@@ -194,25 +194,21 @@ while($row = $db->fetch_array($result))
// make the stuff readable for the customer, #258 // make the stuff readable for the customer, #258
makeChownWithNewStats($row); makeChownWithNewStats($row);
}
/** /**
* Webalizer might run for some time, so we'd better check if our database is still present * Webalizer/AWStats might run for some time, so we'd better check if our database is still present
*/ */
if (empty($db->link_id)
if(empty($db->link_id)
|| $db->link_id === false) || $db->link_id === false)
{ {
fwrite($debugHandler, 'Database-connection seems to be down, trying to reconnect' . "\n"); fwrite($debugHandler, 'Database-connection seems to be down, trying to reconnect' . "\n");
// just in case // just in case
$db->close(); $db->close();
require_once ($pathtophpfiles . '/lib/userdata.inc.php'); require_once ($pathtophpfiles . '/lib/userdata.inc.php');
$db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); $db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']);
if($db->link_id == 0) if ($db->link_id == 0) {
{
fclose($debugHandler); fclose($debugHandler);
unlink($lockfile); unlink($lockfile);
$cronlog->logAction(CRON_ACTION, LOG_ERR, 'Database-connection crashed during traffic-cronjob, could not reconnect!'); $cronlog->logAction(CRON_ACTION, LOG_ERR, 'Database-connection crashed during traffic-cronjob, could not reconnect!');
@@ -225,6 +221,8 @@ while($row = $db->fetch_array($result))
$cronlog->logAction(CRON_ACTION, LOG_WARNING, 'Database-connection crashed during traffic-cronjob, reconnected!'); $cronlog->logAction(CRON_ACTION, LOG_WARNING, 'Database-connection crashed during traffic-cronjob, reconnected!');
} }
}
/** /**
* FTP-Traffic * FTP-Traffic
*/ */
@@ -290,7 +288,7 @@ while($row = $db->fetch_array($result))
if(file_exists($row['documentroot']) && is_dir($row['documentroot'])) if(file_exists($row['documentroot']) && is_dir($row['documentroot']))
{ {
$back = safe_exec('du -s ' . escapeshellarg($row['documentroot']) . ''); $back = safe_exec('du -sk ' . escapeshellarg($row['documentroot']) . '');
foreach($back as $backrow) foreach($back as $backrow)
{ {
$webspaceusage = explode(' ', $backrow); $webspaceusage = explode(' ', $backrow);
@@ -314,7 +312,7 @@ while($row = $db->fetch_array($result))
$maildir = makeCorrectDir($settings['system']['vmail_homedir'] . $row['loginname']); $maildir = makeCorrectDir($settings['system']['vmail_homedir'] . $row['loginname']);
if(file_exists($maildir) && is_dir($maildir)) if(file_exists($maildir) && is_dir($maildir))
{ {
$back = safe_exec('du -s ' . escapeshellarg($maildir) . ''); $back = safe_exec('du -sk ' . escapeshellarg($maildir) . '');
foreach($back as $backrow) foreach($back as $backrow)
{ {
$emailusage = explode(' ', $backrow); $emailusage = explode(' ', $backrow);

2
templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf
View File

@@ -10,7 +10,7 @@ syslog_facility = local1
#auth_debug_passwords= yes #auth_debug_passwords= yes
#auth_verbose= yes #auth_verbose= yes
# #
#ssl=yes ssl=no
#ssl_ca_file = /etc/ssl/<SERVERNAME>.crt #ssl_ca_file = /etc/ssl/<SERVERNAME>.crt
#ssl_cert_file = /etc/ssl/<SERVERNAME>.crt #ssl_cert_file = /etc/ssl/<SERVERNAME>.crt
#ssl_key_file = /etc/ssl/<SERVERNAME>.key #ssl_key_file = /etc/ssl/<SERVERNAME>.key