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

Merge pull request #163 from BNoiZe/master

Browse Source 
More PDO migration. Merge multiple location-blocks of the same directory in ngnix, fixes #1309
This commit is contained in:
Michael Kaufmann
2013-11-26 09:25:22 -08:00
parent 567f789dab 589e422767
commit 35c3f3d71e
2 changed files with 211 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

301
lib/functions/froxlor/function.updateCounters.php
View File

@@ -26,13 +26,11 @@
* @author Froxlor team <team@froxlor.org> (2010-)
*/
function updateCounters($returndebuginfo = false)
{
global $db, $theme;
function updateCounters($returndebuginfo = false) {
global $theme;
$returnval = array();
if($returndebuginfo === true)
{
if($returndebuginfo === true) {
$returnval = array(
'admins' => array(),
'customers' => array()
@@ -43,149 +41,133 @@ function updateCounters($returndebuginfo = false)
// Customers
$customers = $db->query('SELECT * FROM `' . TABLE_PANEL_CUSTOMERS . '` ORDER BY `customerid`');
$customers_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_CUSTOMERS . '` ORDER BY `customerid`');
Database::pexecute($customers_stmt, array());
while($customer = $db->fetch_array($customers))
{
if(!isset($admin_resources[$customer['adminid']]))
{
while($customer = $customers_stmt->fetch(PDO::FETCH_ASSOC)) {
if(!isset($admin_resources[$customer['adminid']])) {
$admin_resources[$customer['adminid']] = Array();
}
if(!isset($admin_resources[$customer['adminid']]['diskspace_used']))
{
if(!isset($admin_resources[$customer['adminid']]['diskspace_used'])) {
$admin_resources[$customer['adminid']]['diskspace_used'] = 0;
}
if(($customer['diskspace'] / 1024) != '-1')
{
if(($customer['diskspace'] / 1024) != '-1') {
$admin_resources[$customer['adminid']]['diskspace_used']+= intval_ressource($customer['diskspace']);
}
if(!isset($admin_resources[$customer['adminid']]['traffic_used']))
{
if(!isset($admin_resources[$customer['adminid']]['traffic_used'])) {
$admin_resources[$customer['adminid']]['traffic_used'] = 0;
}
$admin_resources[$customer['adminid']]['traffic_used']+= $customer['traffic_used'];
if(!isset($admin_resources[$customer['adminid']]['mysqls_used']))
{
if(!isset($admin_resources[$customer['adminid']]['mysqls_used'])) {
$admin_resources[$customer['adminid']]['mysqls_used'] = 0;
}
if($customer['mysqls'] != '-1')
{
if($customer['mysqls'] != '-1') {
$admin_resources[$customer['adminid']]['mysqls_used']+= intval_ressource($customer['mysqls']);
}
if(!isset($admin_resources[$customer['adminid']]['ftps_used']))
{
if(!isset($admin_resources[$customer['adminid']]['ftps_used'])) {
$admin_resources[$customer['adminid']]['ftps_used'] = 0;
}
if($customer['ftps'] != '-1')
{
if($customer['ftps'] != '-1') {
$admin_resources[$customer['adminid']]['ftps_used']+= intval_ressource($customer['ftps']);
}
if(!isset($admin_resources[$customer['adminid']]['tickets_used']))
{
if(!isset($admin_resources[$customer['adminid']]['tickets_used'])) {
$admin_resources[$customer['adminid']]['tickets_used'] = 0;
}
if($customer['tickets'] != '-1')
{
if($customer['tickets'] != '-1') {
$admin_resources[$customer['adminid']]['tickets_used']+= intval_ressource($customer['tickets']);
}
if(!isset($admin_resources[$customer['adminid']]['emails_used']))
{
if(!isset($admin_resources[$customer['adminid']]['emails_used'])) {
$admin_resources[$customer['adminid']]['emails_used'] = 0;
}
if($customer['emails'] != '-1')
{
if($customer['emails'] != '-1') {
$admin_resources[$customer['adminid']]['emails_used']+= intval_ressource($customer['emails']);
}
if(!isset($admin_resources[$customer['adminid']]['email_accounts_used']))
{
if(!isset($admin_resources[$customer['adminid']]['email_accounts_used'])) {
$admin_resources[$customer['adminid']]['email_accounts_used'] = 0;
}
if($customer['email_accounts'] != '-1')
{
if($customer['email_accounts'] != '-1') {
$admin_resources[$customer['adminid']]['email_accounts_used']+= intval_ressource($customer['email_accounts']);
}
if(!isset($admin_resources[$customer['adminid']]['email_forwarders_used']))
{
if(!isset($admin_resources[$customer['adminid']]['email_forwarders_used'])) {
$admin_resources[$customer['adminid']]['email_forwarders_used'] = 0;
}
if($customer['email_forwarders'] != '-1')
{
if($customer['email_forwarders'] != '-1') {
$admin_resources[$customer['adminid']]['email_forwarders_used']+= intval_ressource($customer['email_forwarders']);
}
if(!isset($admin_resources[$customer['adminid']]['email_quota_used']))
{
if(!isset($admin_resources[$customer['adminid']]['email_quota_used'])) {
$admin_resources[$customer['adminid']]['email_quota_used'] = 0;
}
if($customer['email_quota'] != '-1')
{
if($customer['email_quota'] != '-1') {
$admin_resources[$customer['adminid']]['email_quota_used']+= intval_ressource($customer['email_quota']);
}
if(!isset($admin_resources[$customer['adminid']]['email_autoresponder_used']))
{
if(!isset($admin_resources[$customer['adminid']]['email_autoresponder_used'])) {
$admin_resources[$customer['adminid']]['email_autoresponder_used'] = 0;
}
if($customer['email_autoresponder'] != '-1')
{
if($customer['email_autoresponder'] != '-1') {
$admin_resources[$customer['adminid']]['email_autoresponder_used']+= intval_ressource($customer['email_autoresponder']);
}
if(!isset($admin_resources[$customer['adminid']]['subdomains_used']))
{
if(!isset($admin_resources[$customer['adminid']]['subdomains_used'])) {
$admin_resources[$customer['adminid']]['subdomains_used'] = 0;
}
if($customer['subdomains'] != '-1')
{
if($customer['subdomains'] != '-1') {
$admin_resources[$customer['adminid']]['subdomains_used']+= intval_ressource($customer['subdomains']);
}
if(!isset($admin_resources[$customer['adminid']]['aps_packages_used']))
{
if(!isset($admin_resources[$customer['adminid']]['aps_packages_used'])) {
$admin_resources[$customer['adminid']]['aps_packages_used'] = 0;
}
if($customer['aps_packages'] != '-1')
{
if($customer['aps_packages'] != '-1') {
$admin_resources[$customer['adminid']]['aps_packages_used']+= intval_ressource($customer['aps_packages']);
}
$customer_mysqls = $db->query_first('SELECT COUNT(*) AS `number_mysqls` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_mysqls_stmt = Database::prepare('SELECT COUNT(*) AS `number_mysqls` FROM `' . TABLE_PANEL_DATABASES . '`
WHERE `customerid` = :cid'
);
$customer_mysqls = Database::pexecute_first($customer_mysqls_stmt, array("cid" => $customer['customerid']));
$customer['mysqls_used_new'] = (int)$customer_mysqls['number_mysqls'];
$customer_emails = $db->query_first('SELECT COUNT(*) AS `number_emails` FROM `' . TABLE_MAIL_VIRTUAL . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_emails_stmt = Database::prepare('SELECT COUNT(*) AS `number_emails` FROM `' . TABLE_MAIL_VIRTUAL . '`
WHERE `customerid` = :cid'
);
$customer_emails = Database::pexecute_first($customer_emails_stmt, array("cid" => $customer['customerid']));
$customer['emails_used_new'] = (int)$customer_emails['number_emails'];
$customer_emails_result = $db->query('SELECT `email`, `email_full`, `destination`, `popaccountid` AS `number_email_forwarders` FROM `' . TABLE_MAIL_VIRTUAL . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '" ');
$customer_emails_result_stmt = Database::prepare('SELECT `email`, `email_full`, `destination`, `popaccountid` AS `number_email_forwarders` FROM `' . TABLE_MAIL_VIRTUAL . '`
WHERE `customerid` = :cid'
);
Database::pexecute($customer_emails_result_stmt, array("cid" => $customer['customerid']));
$customer_email_forwarders = 0;
$customer_email_accounts = 0;
while($customer_emails_row = $db->fetch_array($customer_emails_result))
{
if($customer_emails_row['destination'] != '')
{
while($customer_emails_row = $customer_emails_result_stmt->fetch(PDO::FETCH_ASSOC)) {
if($customer_emails_row['destination'] != '') {
$customer_emails_row['destination'] = explode(' ', makeCorrectDestination($customer_emails_row['destination']));
$customer_email_forwarders+= count($customer_emails_row['destination']);
if(in_array($customer_emails_row['email_full'], $customer_emails_row['destination']))
{
if(in_array($customer_emails_row['email_full'], $customer_emails_row['destination'])) {
$customer_email_forwarders-= 1;
$customer_email_accounts++;
}
@@ -194,176 +176,191 @@ function updateCounters($returndebuginfo = false)
$customer['email_accounts_used_new'] = $customer_email_accounts;
$customer['email_forwarders_used_new'] = $customer_email_forwarders;
$customer_ftps = $db->query_first('SELECT COUNT(*) AS `number_ftps` FROM `' . TABLE_FTP_USERS . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_ftps_stmt = Database::prepare('SELECT COUNT(*) AS `number_ftps` FROM `' . TABLE_FTP_USERS . '` WHERE `customerid` = :cid');
$customer_ftps = Database::pexecute_first($customer_emails_result_stmt, array("cid" => $customer['customerid']));
$customer['ftps_used_new'] = ((int)$customer_ftps['number_ftps'] - 1);
$customer_tickets = $db->query_first('SELECT COUNT(*) AS `number_tickets` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto` = "0" AND `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_tickets_stmt = Database::prepare('SELECT COUNT(*) AS `number_tickets` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto` = "0" AND `customerid` = :cid');
$customer_tickets = Database::pexecute_first($customer_tickets_stmt, array("cid" => $customer['customerid']));
$customer['tickets_used_new'] = (int)$customer_tickets['number_tickets'];
$customer_subdomains = $db->query_first('SELECT COUNT(*) AS `number_subdomains` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '" AND `parentdomainid` <> "0"');
$customer_subdomains_stmt = Database::prepare('SELECT COUNT(*) AS `number_subdomains` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `customerid` = :cid AND `parentdomainid` <> "0"');
$customer_subdomains = Database::pexecute_first($customer_subdomains_stmt, array("cid" => $customer['customerid']));
$customer['subdomains_used_new'] = (int)$customer_subdomains['number_subdomains'];
$customer_email_quota = $db->query_first('SELECT SUM(`quota`) AS `email_quota` FROM `' . TABLE_MAIL_USERS . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_email_quota_stmt = Database::prepare('SELECT SUM(`quota`) AS `email_quota` FROM `' . TABLE_MAIL_USERS . '` WHERE `customerid` = :cid');
$customer_email_quota = Database::pexecute_first($customer_email_quota_stmt, array("cid" => $customer['customerid']));
$customer['email_quota_used_new'] = (int)$customer_email_quota['email_quota'];
$customer_email_autoresponder = $db->query_first('SELECT COUNT(*) AS `number_autoresponder` FROM `' . TABLE_MAIL_AUTORESPONDER . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"');
$customer_email_autoresponder_stmt = Database::prepare('SELECT COUNT(*) AS `number_autoresponder` FROM `' . TABLE_MAIL_AUTORESPONDER . '` WHERE `customerid` = :cid');
$customer_email_autoresponder = Database::pexecute_first($customer_email_autoresponder_stmt, array("cid" => $customer['customerid']));
$customer['email_autoresponder_used_new'] = (int)$customer_email_autoresponder['number_autoresponder'];
$customer_aps_packages = $db->query_first('SELECT COUNT(*) AS `number_apspackages` FROM `' . TABLE_APS_INSTANCES . '` WHERE `CustomerID` = "' . (int)$customer['customerid'] . '"');
$customer_aps_packages_stmt = Database::prepare('SELECT COUNT(*) AS `number_apspackages` FROM `' . TABLE_APS_INSTANCES . '` WHERE `CustomerID` = :cid');
$customer_aps_packages = Database::pexecute_first($customer_aps_packages_stmt, array("cid" => $customer['customerid']));
$customer['aps_packages_used_new'] = (int)$customer_aps_packages['number_apspackages'];
$db->query('UPDATE
`' . TABLE_PANEL_CUSTOMERS . '`
SET
`mysqls_used` = "' . (int)$customer['mysqls_used_new'] . '",
`emails_used` = "' . (int)$customer['emails_used_new'] . '",
`email_accounts_used` = "' . (int)$customer['email_accounts_used_new'] . '",
`email_forwarders_used` = "' . (int)$customer['email_forwarders_used_new'] . '",
`email_quota_used` = "' . (int)$customer['email_quota_used_new'] . '",
`email_autoresponder_used` = "' . (int)$customer['email_autoresponder_used_new'] . '",
`ftps_used` = "' . (int)$customer['ftps_used_new'] . '",
`tickets_used` = "' . (int)$customer['tickets_used_new'] . '",
`subdomains_used` = "' . (int)$customer['subdomains_used_new'] . '",
`aps_packages_used` = "' . (int)$customer['aps_packages_used_new'] . '"
WHERE
`customerid` = "' . (int)$customer['customerid'] . '"
');
$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
SET `mysqls_used` = :mysqls_used,
`emails_used` = :emails_used,
`email_accounts_used` = :email_accounts_used,
`email_forwarders_used` = :email_forwarders_used,
`email_quota_used` = :email_quota_used,
`email_autoresponder_used` = :email_autoresponder_used,
`ftps_used` = :ftps_used,
`tickets_used` = :tickets_used,
`subdomains_used` = :subdomains_used,
`aps_packages_used` = :aps_packages_used
WHERE `customerid` = :cid'
);
$params = array(
"mysqls_used" => $customer['mysqls_used_new'],
"emails_used" => $customer['emails_used_new'],
"email_accounts_used" => $customer['email_accounts_used_new'],
"email_forwarders_used" => $customer['email_forwarders_used_new'],
"email_quota_used" => $customer['email_quota_used_new'],
"email_autoresponder_used" => $customer['email_autoresponder_used_new'],
"ftps_used" => $customer['ftps_used_new'],
"tickets_used" => $customer['tickets_used_new'],
"subdomains_used" => $customer['subdomains_used_new'],
"aps_packages_used" => $customer['aps_packages_used_new'],
"cid" => $customer['customerid']
);
Database::pexecute($stmt, $params);
if($returndebuginfo === true)
{
if($returndebuginfo === true) {
$returnval['customers'][$customer['customerid']] = $customer;
}
}
// Admins
$admins = $db->query('SELECT * FROM `' . TABLE_PANEL_ADMINS . '` ORDER BY `adminid`');
$admins_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_ADMINS . '` ORDER BY `adminid`');
Database::pexecute($admins_stmt, array());
while($admin = $db->fetch_array($admins))
{
$admin_customers = $db->query_first('SELECT COUNT(*) AS `number_customers` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `adminid` = "' . (int)$admin['adminid'] . '"');
while($admin = $admins_stmt->fetch(PDO::FETCH_ASSOC)) {
$admin_customers_stmt = Database::prepare('SELECT COUNT(*) AS `number_customers` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `adminid` = :aid');
$admin_customers = Database::pexecute_first($admin_customers_stmt, array("aid" => $admin['adminid']));
$admin['customers_used_new'] = $admin_customers['number_customers'];
$admin_domains = $db->query_first('SELECT COUNT(*) AS `number_domains` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `adminid` = "' . (int)$admin['adminid'] . '" AND `isemaildomain` = "1"');
$admin_domains_stmt = Database::prepare('SELECT COUNT(*) AS `number_domains` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `adminid` = :aid AND `isemaildomain` = "1"');
$admin_domains = Database::pexecute_first($admin_domains_stmt, array("aid" => $admin['adminid']));
$admin['domains_used_new'] = $admin_domains['number_domains'];
if(!isset($admin_resources[$admin['adminid']]))
{
if(!isset($admin_resources[$admin['adminid']])) {
$admin_resources[$admin['adminid']] = Array();
}
if(!isset($admin_resources[$admin['adminid']]['diskspace_used']))
{
if(!isset($admin_resources[$admin['adminid']]['diskspace_used'])) {
$admin_resources[$admin['adminid']]['diskspace_used'] = 0;
}
$admin['diskspace_used_new'] = $admin_resources[$admin['adminid']]['diskspace_used'];
if(!isset($admin_resources[$admin['adminid']]['traffic_used']))
{
if(!isset($admin_resources[$admin['adminid']]['traffic_used'])) {
$admin_resources[$admin['adminid']]['traffic_used'] = 0;
}
$admin['traffic_used_new'] = $admin_resources[$admin['adminid']]['traffic_used'];
if(!isset($admin_resources[$admin['adminid']]['mysqls_used']))
{
if(!isset($admin_resources[$admin['adminid']]['mysqls_used'])) {
$admin_resources[$admin['adminid']]['mysqls_used'] = 0;
}
$admin['mysqls_used_new'] = $admin_resources[$admin['adminid']]['mysqls_used'];
if(!isset($admin_resources[$admin['adminid']]['ftps_used']))
{
if(!isset($admin_resources[$admin['adminid']]['ftps_used'])) {
$admin_resources[$admin['adminid']]['ftps_used'] = 0;
}
$admin['ftps_used_new'] = $admin_resources[$admin['adminid']]['ftps_used'];
if(!isset($admin_resources[$admin['adminid']]['emails_used']))
{
if(!isset($admin_resources[$admin['adminid']]['emails_used'])) {
$admin_resources[$admin['adminid']]['emails_used'] = 0;
}
$admin['emails_used_new'] = $admin_resources[$admin['adminid']]['emails_used'];
if(!isset($admin_resources[$admin['adminid']]['email_accounts_used']))
{
if(!isset($admin_resources[$admin['adminid']]['email_accounts_used'])) {
$admin_resources[$admin['adminid']]['email_accounts_used'] = 0;
}
$admin['email_accounts_used_new'] = $admin_resources[$admin['adminid']]['email_accounts_used'];
if(!isset($admin_resources[$admin['adminid']]['tickets_used']))
{
if(!isset($admin_resources[$admin['adminid']]['tickets_used'])) {
$admin_resources[$admin['adminid']]['tickets_used'] = 0;
}
$admin['tickets_used_new'] = $admin_resources[$admin['adminid']]['tickets_used'];
if(!isset($admin_resources[$admin['adminid']]['email_forwarders_used']))
{
if(!isset($admin_resources[$admin['adminid']]['email_forwarders_used'])) {
$admin_resources[$admin['adminid']]['email_forwarders_used'] = 0;
}
$admin['email_forwarders_used_new'] = $admin_resources[$admin['adminid']]['email_forwarders_used'];
if(!isset($admin_resources[$admin['adminid']]['email_quota_used']))
{
if(!isset($admin_resources[$admin['adminid']]['email_quota_used'])) {
$admin_resources[$admin['adminid']]['email_quota_used'] = 0;
}
$admin['email_quota_used_new'] = $admin_resources[$admin['adminid']]['email_quota_used'];
if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used']))
{
$admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0;
}
if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used']))
{
if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used'])) {
$admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0;
}
$admin['email_autoresponder_used_new'] = $admin_resources[$admin['adminid']]['email_autoresponder_used'];
if(!isset($admin_resources[$admin['adminid']]['subdomains_used']))
{
if(!isset($admin_resources[$admin['adminid']]['subdomains_used'])) {
$admin_resources[$admin['adminid']]['subdomains_used'] = 0;
}
if(!isset($admin_resources[$admin['adminid']]['aps_packages_used']))
{
$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
}
$admin['subdomains_used_new'] = $admin_resources[$admin['adminid']]['subdomains_used'];
if(!isset($admin_resources[$admin['adminid']]['aps_packages_used']))
{
if(!isset($admin_resources[$admin['adminid']]['aps_packages_used'])) {
$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
}
$admin['aps_packages_used_new'] = $admin_resources[$admin['adminid']]['aps_packages_used'];
$db->query('UPDATE
`' . TABLE_PANEL_ADMINS . '`
SET
`customers_used` = "' . (int)$admin['customers_used_new'] . '",
`domains_used` = "' . (int)$admin['domains_used_new'] . '",
`diskspace_used` = "' . (int)$admin['diskspace_used_new'] . '",
`mysqls_used` = "' . (int)$admin['mysqls_used_new'] . '",
`emails_used` = "' . (int)$admin['emails_used_new'] . '",
`email_accounts_used` = "' . (int)$admin['email_accounts_used_new'] . '",
`email_forwarders_used` = "' . (int)$admin['email_forwarders_used_new'] . '",
`email_quota_used` = "' . (int)$admin['email_quota_used_new'] . '",
`email_autoresponder_used` = "' . (int)$admin['email_autoresponder_used_new'] . '",
`ftps_used` = "' . (int)$admin['ftps_used_new'] . '",
`tickets_used` = "' . (int)$admin['tickets_used_new'] . '",
`subdomains_used` = "' . (int)$admin['subdomains_used_new'] . '",
`traffic_used` = "' . (int)$admin['traffic_used_new'] . '",
`aps_packages_used` = "' . (int)$admin['aps_packages_used_new'] . '"
WHERE
`adminid` = "' . (int)$admin['adminid'] . '"
');
$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_ADMINS . '`
SET `customers_used` = :customers_used,
`domains_used` = :domains_used,
`diskspace_used` = :diskspace_used,
`mysqls_used` = :mysqls_used,
`emails_used` = :emails_used,
`email_accounts_used` = :email_accounts_used,
`email_forwarders_used` = :email_forwarders_used,
`email_quota_used` = :email_quota_used,
`email_autoresponder_used` = :email_autoresponder_used,
`ftps_used` = :ftps_used,
`tickets_used` = :tickets_used,
`subdomains_used` = :subdomains_used,
`traffic_used` = :traffic_used,
`aps_packages_used` = :aps_packages_used
WHERE `adminid` = :aid'
);
$params = array(
"customers_used" => $admin['customers_used_new'],
"domains_used" => $admin['domains_used_new'],
"diskspace_used" => $admin['diskspace_used_new'],
"mysqls_used" => $admin['mysqls_used_new'],
"emails_used" => $admin['emails_used_new'],
"email_accounts_used" => $admin['email_accounts_used_new'],
"email_forwarders_used" => $admin['email_forwarders_used_new'],
"email_quota_used" => $admin['email_quota_used_new'],
"email_autoresponder_used" => $admin['email_autoresponder_used_new'],
"ftps_used" => $admin['ftps_used_new'],
"tickets_used" => $admin['tickets_used_new'],
"subdomains_used" => $admin['subdomains_used_new'],
"traffic_used" => $admin['traffic_used_new'],
"aps_packages_used" => $admin['aps_packages_used_new'],
"aid" => $admin['adminid']
);
Database::pexecute($stmt, $params);
if($returndebuginfo === true)
{
if($returndebuginfo === true) {
$returnval['admins'][$admin['adminid']] = $admin;
}
}

75
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -464,23 +464,70 @@ class nginx
$vhost_content .= $this->settings['system']['default_vhostconf'] . "\n";
}
}
// merge duplicate / sections, #1193
$l_regex1 = "/(location\ \/\ \{)(.*)(\})/smU";
$l_regex2 = "/(location\ \/\ \{.*\})/smU";
$replace_by = '';
$replacements = preg_match_all($l_regex1,$vhost_content,$out);
if ($replacements > 1) {
foreach ($out[2] as $val) {
$replace_by .= $val."\n";
}
$vhost_content = preg_replace($l_regex2, "", $vhost_content, $replacements-1);
$vhost_content = preg_replace($l_regex2, "location / {\n\t\t". $replace_by ."\t}\n", $vhost_content);
}
}
$vhost_content .= '}' . "\n\n";
return $vhost_content;
return $this->mergeVhostBlocks($vhost_content);
}
protected function mergeVhostBlocks($vhost_content) {
$vhost_content = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost_content))));
$vhost_content = array_filter($vhost_content, create_function('$a','return preg_match("#\S#", $a);'));
// Merge similar blocks
$new_vhost_content = array();
$isOpen = false;
$addAfter = false;
foreach ($vhost_content as $line) {
if (substr_count($line, "{") != 0 && substr_count($line, "}") == 0 && substr_count($line, "server") == 0 && $isOpen === false) {
$isOpen = true;
$addAfter = array_search($line, $new_vhost_content);
if ($addAfter === false) {
$new_vhost_content[] = $line;
}
} elseif ($isOpen === true) {
if (substr_count($line, "}") != 0 && substr_count($line, "{") == 0) {
$isOpen = false;
if ($addAfter === false) {
$new_vhost_content[] = "}";
} else {
$addAfter = false;
}
} else {
if ($addAfter != false) {
for ($i = $addAfter; $i < count($new_vhost_content); $i++) {
if ($new_vhost_content[$i] == "}") {
$addAt = $i;
break;
}
}
array_splice($new_vhost_content, $addAt, 0, $line);
} else {
$new_vhost_content[] = $line;
}
}
} else {
$new_vhost_content[] = $line;
}
}
// Fix idention
$nextLevel = 0;
for ($i = 0; $i < count($new_vhost_content); $i++) {
if (substr_count($new_vhost_content[$i], "}") != 0 && substr_count($new_vhost_content[$i], "{") == 0) {
$nextLevel -= 1;
}
if ($nextLevel > 0) {
for ($j = 0; $j < $nextLevel; $j++) {
$new_vhost_content[$i] = " " . $new_vhost_content[$i];
}
}
if (substr_count($new_vhost_content[$i], "{") != 0 && substr_count($new_vhost_content[$i], "}") == 0) {
$nextLevel += 1;
}
}
return implode("\n", $new_vhost_content);
}
protected function composeSslSettings($domain) {