Révision 789b7877
| plugins/anet_epacks/front/plugin_anet_epacks.view_array_recap.php | ||
|---|---|---|
| 90 | 90 |
(g5.nbeleves+g5.nbprofs) as nbusers, g5.nbpc as nbpc |
| 91 | 91 |
FROM glpi_plugin_anet_epacks AS e |
| 92 | 92 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
| 93 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID
|
|
| 93 |
LEFT JOIN glpi_entities AS g3 ON (e.FK_client=g3.ID OR e.FK_enduser=g3.ID)
|
|
| 94 | 94 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 95 | 95 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
| 96 | 96 |
|
| ... | ... | |
| 135 | 135 |
(g5.nbeleves+g5.nbprofs) as nbusers, g5.nbpc as nbpc |
| 136 | 136 |
FROM glpi_plugin_anet_epacks AS e |
| 137 | 137 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
| 138 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID
|
|
| 138 |
LEFT JOIN glpi_entities AS g3 ON (e.FK_client=g3.ID OR e.FK_enduser=g3.ID)
|
|
| 139 | 139 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 140 | 140 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
| 141 | 141 |
$query .= "WHERE e.FK_enduser='0' AND e.FK_client!='0'\n"; |
| ... | ... | |
| 153 | 153 |
(g5.nbeleves+g5.nbprofs) as nbusers, g5.nbpc as nbpc |
| 154 | 154 |
FROM glpi_plugin_anet_epacks AS e |
| 155 | 155 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
| 156 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID
|
|
| 156 |
LEFT JOIN glpi_entities AS g3 ON (e.FK_client=g3.ID OR e.FK_enduser=g3.ID)
|
|
| 157 | 157 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 158 | 158 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
| 159 | 159 |
|
| ... | ... | |
| 281 | 281 |
(sum(g5.nbeleves)+sum(g5.nbprofs)) as nbusers, g5.nbpc as nbpc |
| 282 | 282 |
FROM glpi_plugin_anet_epacks AS e |
| 283 | 283 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
| 284 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID
|
|
| 284 |
LEFT JOIN glpi_entities AS g3 ON (e.FK_client=g3.ID OR e.FK_enduser=g3.ID)
|
|
| 285 | 285 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 286 | 286 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
| 287 | 287 |
//WHERE e.Fk_Serveur > '0'\n"; |
| ... | ... | |
| 309 | 309 |
$query = "SELECT e.*, e.FK_client as entityid, g3.name as client, g4.name as serveur, g4.os_license_number, g4.os_license_id, g4.otherserial, ssh.* |
| 310 | 310 |
FROM glpi_plugin_anet_epacks AS e |
| 311 | 311 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
| 312 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID
|
|
| 312 |
LEFT JOIN glpi_entities AS g3 ON (e.FK_client=g3.ID OR e.FK_enduser=g3.ID)
|
|
| 313 | 313 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 314 | 314 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur |
| 315 | 315 |
WHERE e.FK_enduser='0' AND e.FK_client!='0' |
Formats disponibles : Unified diff