Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1626

Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)

Upravy:

- optimalizace a opravy kolem provozu

Zobrazit rozdíly:

freenetis/branches/testing/application/vendors/unit_tester/unit_testing_config.xml
<param value=""/>
</input>
</values>
</method></controller>
</method>
<method name="logo" autogenerate="on">
<attributes></attributes>
<values>
<input></input>
</values>
</method>
</controller>
<controller name="registration">
<method name="index" autogenerate="off">
<attributes/>
freenetis/branches/testing/application/models/ip_addresses_traffic.php
i.device_id = d.id AND d.user_id = u.id
");
// now for ip addresses of vlan ifaces
$this->db->query("
UPDATE ip_addresses_traffics t, ip_addresses ip, vlan_ifaces vi,
ifaces i, devices d, users u
SET t.member_id = u.member_id
WHERE t.ip_address = ip.ip_address AND
ip.vlan_iface_id = vi.id AND vi.iface_id = i.id AND
i.device_id = d.id AND d.user_id = u.id
");
// now for ip addresses which are not in ip_addresses table and have owner
$this->db->query("
UPDATE ip_addresses_traffics t, subnets s, subnets_owners so, members m
freenetis/branches/testing/application/models/members_traffic.php
return FALSE;
return $this->db->query("
SELECT COUNT(*) AS count
FROM (
SELECT *
FROM members_traffics
WHERE day BETWEEN ? AND ?
GROUP BY member_id
) AS q
SELECT COUNT(DISTINCT member_id) AS count
FROM members_traffics
WHERE day BETWEEN ? AND ?
", array($date_from, $date_to))->current()->count;
}
......
MONTH(day) AS month,
YEAR(day) AS year,
active
FROM members_traffics d
FROM members_traffics d
$group_by
) d
JOIN members m ON d.member_id = m.id
......
SELECT COUNT(*) AS count FROM
(
SELECT
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
IFNULL(SUM(upload),0) + IFNULL(SUM(download),0) AS total,
IFNULL(AVG(upload),0) AS avg_upload,
IFNULL(AVG(download),0) AS avg_download,
IFNULL(SUM(local_upload),0) AS local_upload,
IFNULL(SUM(local_download),0) AS local_download,
(upload - local_upload) AS foreign_upload,
(download - local_download) AS foreign_download,
day,
WEEK(day) AS week,
MONTH(day) AS month,
YEAR(day) AS year
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
day
FROM members_traffics d
$group_by
) d
......
member_id,
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
IFNULL(SUM(local_upload),0) AS local_upload,
IFNULL(SUM(local_download),0) AS local_download,
SUM(upload - local_upload) AS foreign_upload,
SUM(download - local_download) AS foreign_download,
day,
WEEK(day) AS week,
MONTH(day) AS month,
YEAR(day) AS year,
active
day
FROM members_traffics d
$group_by
) d
......
SELECT
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
IFNULL(SUM(upload),0) + IFNULL(SUM(download),0) AS total,
IFNULL(AVG(upload),0) AS avg_upload,
IFNULL(AVG(download),0) AS avg_download,
IFNULL(SUM(local_upload),0) AS local_upload,
IFNULL(SUM(local_download),0) AS local_download,
SUM(upload - local_upload) AS foreign_upload,
SUM(download - local_download) AS foreign_download,
day,
WEEK(day) AS week,
MONTH(day) AS month,
YEAR(day) AS year
day
FROM members_traffics d
WHERE d.member_id = ?
$group_by
......
(
SELECT
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
IFNULL(SUM(upload),0) + IFNULL(SUM(download),0) AS total,
IFNULL(AVG(upload),0) AS avg_upload,
IFNULL(AVG(download),0) AS avg_download,
day,
WEEK(day) AS week,
MONTH(day) AS month,
YEAR(day) AS year
IFNULL(SUM(download),0) AS download
FROM members_traffics d
$group_by
) d
......
(
SELECT
IFNULL(SUM(upload),0) AS upload,
IFNULL(SUM(download),0) AS download,
IFNULL(SUM(upload),0) + IFNULL(SUM(download),0) AS total,
IFNULL(AVG(upload),0) AS avg_upload,
IFNULL(AVG(download),0) AS avg_download,
day,
WEEK(day) AS week,
MONTH(day) AS month,
YEAR(day) AS year
IFNULL(SUM(download),0) AS download
FROM members_traffics d
WHERE d.member_id = ?
$group_by
freenetis/branches/testing/application/models/users_contacts.php
}
/**
* Returns all contacts from subnets by type
*
* @author Michal Kliment
* @param integer $subnet_id
* @param integer $type
* @param bool $ignore_whitelisted
* @return Mysql_Result
*/
public function get_contacts_by_subnet_and_type (
$subnet_id, $type, $ignore_whitelisted = FALSE)
{
if ($ignore_whitelisted)
$whitelisted = "";
else
$whitelisted = "AND uc.whitelisted = 0";
return $this->db->query("
SELECT
c.value, a.balance, m.id AS member_id, m.name AS member_name,
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM
(
SELECT
IFNULL(u.member_id,ip.member_id) AS member_id
FROM
(
SELECT
IFNULL(i1.device_id, i2.device_id) AS device_id,
ip.member_id
FROM ip_addresses ip
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
WHERE ip.subnet_id = ?
) ip
LEFT JOIN devices d ON ip.device_id = d.id
LEFT JOIN users u ON d.user_id = u.id
) ip
JOIN members m ON ip.member_id = m.id AND m.id <> 1 AND m.type <> ?
JOIN accounts a ON a.member_id = m.id
JOIN users u ON u.member_id = m.id
JOIN users_contacts uc ON uc.user_id = u.id $whitelisted
JOIN contacts c ON uc.contact_id = c.id AND c.type = ?
LEFT JOIN contacts_countries cc ON cc.contact_id = c.id
LEFT JOIN countries cou ON cou.id = cc.country_id
WHERE m.id NOT IN
(
SELECT m.id
FROM members m
JOIN membership_interrupts mi ON mi.member_id = m.id
JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
)
GROUP BY c.id
", $subnet_id, Member_Model::TYPE_FORMER, $type);
}
/**
* Returns all contacts of members by type
*
* @author Michal Kliment
freenetis/branches/testing/application/models/vlan.php
* @property string $name
* @property integer $tag_802_1q
* @property string $comment
* @property ORM_Iterator $vlan_ifaces
* @property ORM_Iterator $ifaces_vlans
*/
class Vlan_Model extends ORM
{
freenetis/branches/testing/application/models/ulog2_ct.php
SET _local_download = _is_local * _download;
SELECT IFNULL(u.member_id, ip.member_id) INTO _member_id
FROM
(
SELECT ip_address, ip.member_id, IFNULL(i1.device_id, i2.device_id) AS device_id
FROM ip_addresses ip
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
) ip
LEFT JOIN devices d ON ip.device_id = d.id
FROM ip_addresses ip
LEFT JOIN ifaces i ON ip.iface_id = i.id
LEFT JOIN devices d ON i.device_id = d.id
LEFT JOIN users u ON d.user_id = u.id
WHERE ip.ip_address = _ip_address;
freenetis/branches/testing/application/controllers/traffic.php
$this->sections = array
(
url_lang::base().'traffic/show_all' => __('Total traffic'),
url_lang::base().'traffic/ip_addresses' => __('Traffic of IP addresses'),
url_lang::base().'traffic/ip_addresses' => __('Traffic of IP addresses'),
url_lang::base().'traffic/members' => __('Traffic of members')
);
......
$this->ulogd_update_prev = Settings::get('ulogd_update_last')
- Settings::get('ulogd_update_interval');
}
/**
* Redirects to show all
*
......
if ($form->validate())
{
url::redirect(
"traffic/show_all/".
$allowed_types[$form->type->value]
);
url::redirect('traffic/show_all/'.$allowed_types[$form->type->value]);
}
$view = new View('main');

Také k dispozici: Unified diff