Révision 2a106d8b
plugins/anet_epacks/front/plugin_anet_epacks.view_array_recap.php | ||
---|---|---|
86 | 86 |
// |
87 | 87 |
// |
88 | 88 |
function local_make_query($data, $entityid, $maintenance) { |
89 |
$query = "SELECT e.*, e.FK_enduser as entityid, g3.name as client, g4.name as serveur, g4.os_license_number, g4.os_license_id, ssh.*, |
|
89 |
$query = "SELECT e.*, e.FK_enduser as entityid, g3.name as client, g4.name as serveur, g4.os_license_number, g4.os_license_id, g4.otherserial, ssh.*,
|
|
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 |
|
... | ... | |
152 | 152 |
$total_nbusers = 0; |
153 | 153 |
//La liste des entites qu'on affiche |
154 | 154 |
$tab_deja_affiche = array(); |
155 |
|
|
155 |
$num_debut_ligne = 0; |
|
156 |
|
|
156 | 157 |
for($i = 0; $i < $DB->numrows($result); $i++) { |
158 |
$num_debut_ligne++; |
|
157 | 159 |
$data=$DB->fetch_array($result); |
158 | 160 |
$tab_deja_affiche[] = $data['entityid']; |
159 | 161 |
$ssh_dateLastOK = ""; |
... | ... | |
181 | 183 |
print "<tr class='tab_bg_2'> |
182 | 184 |
<td align=\"left\">\n"; |
183 | 185 |
if($data['entityid'] > 0) { |
184 |
print " " . ($i+1) . ". <a href=\"../../manageentity/index.php?active_entity=" . $data['entityid'] . "\">" . $data['client'] . ": " . $data['serveur'] . "</a>\n";
|
|
186 |
print " " . $num_debut_ligne . ". <a href=\"../../manageentity/index.php?active_entity=" . $data['entityid'] . "\">" . $data['client'] . ": " . $data['serveur'] . "</a>\n";
|
|
185 | 187 |
} |
186 | 188 |
else { |
187 |
print " " . ($i+1) . ". " . $data['client'] . ": " . $data['serveur'] . "(abonnement zen jamais activé)\n";
|
|
189 |
print " " . $num_debut_ligne . ". " . $data['client'] . ": " . $data['serveur'] . "(abonnement zen jamais activé)\n";
|
|
188 | 190 |
} |
189 | 191 |
print " </td> |
190 | 192 |
<td>" . $ssh_status . "</td> |
191 | 193 |
<td>" . $data['sshdate'] . $ssh_dateLastOK . "</td> |
192 |
<td align=\"left\">" . $data['os_license_id'] . "<br />" . $data['os_license_number'] . "</td>
|
|
194 |
<td align=\"left\">" . $data['os_license_id'] . " " . $data['otherserial'] . "<br />" . $data['os_license_number'] . " " . $data['otherserial'] ."</td>
|
|
193 | 195 |
<td>" . $data['nbpc'] . "</td> |
194 | 196 |
<td>" . $data['nbusers'] . "</td> |
195 | 197 |
<td> |
... | ... | |
219 | 221 |
} |
220 | 222 |
//$query = "SELECT ID FROM glpi_entities WHERE parentID='" . $entityparent . "'"; |
221 | 223 |
|
222 |
$query = "SELECT e.*, e.FK_enduser as entityid, g3.name as client, g4.name as serveur, g4.os_license_number, g4.os_license_id, ssh.*, |
|
224 |
$query = "SELECT e.*, e.FK_enduser as entityid, g3.name as client, g4.name as serveur, g4.os_license_number, g4.os_license_id, g4.otherserial, ssh.*,
|
|
223 | 225 |
(sum(g5.nbeleves)+sum(g5.nbprofs)) as nbusers, g5.nbpc as nbpc |
224 | 226 |
FROM glpi_plugin_anet_epacks AS e |
225 | 227 |
LEFT JOIN glpi_plugin_anet_epacks_ssh_max AS ssh ON e.FK_serveur=ssh.FK_serveur |
226 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID |
|
228 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID OR e.FK_enduser=g3.ID
|
|
227 | 229 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
228 | 230 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
229 | 231 |
//WHERE e.Fk_Serveur > '0'\n"; |
... | ... | |
248 | 250 |
$result = $DB->query($query) or die($DB->error()); |
249 | 251 |
|
250 | 252 |
for($i = 0; $i < $DB->numrows($result); $i++) { |
253 |
$num_debut_ligne++; |
|
251 | 254 |
$data=$DB->fetch_array($result); |
252 | 255 |
$ssh_dateLastOK = ""; |
253 | 256 |
if(! in_array($data['entityid'],$tab_deja_affiche)) { |
... | ... | |
276 | 279 |
print "<tr class='tab_bg_2'> |
277 | 280 |
<td align=\"left\">\n"; |
278 | 281 |
if($data['entityid'] > 0) { |
279 |
print " " . ($i+1) . ". <a href=\"../../manageentity/index.php?active_entity=" . $data['entityid'] . "\">" . $data['client'] . ": " . $data['serveur'] . "</a>\n";
|
|
282 |
print " " . $num_debut_ligne . ". <a href=\"../../manageentity/index.php?active_entity=" . $data['entityid'] . "\">" . $data['client'] . ": " . $data['serveur'] . "</a>\n";
|
|
280 | 283 |
} |
281 | 284 |
else { |
282 |
print " " . ($i+1) . ". " . $data['client'] . ": " . $data['serveur'] . "(abonnement zen jamais activé)\n";
|
|
285 |
print " " . $num_debut_ligne . ". " . $data['client'] . ": " . $data['serveur'] . "(abonnement zen jamais activé)\n";
|
|
283 | 286 |
} |
284 | 287 |
print " </td> |
285 | 288 |
<td>" . $ssh_status . "</td> |
286 | 289 |
<td>" . $data['sshdate'] . $ssh_dateLastOK . "</td> |
287 |
<td align=\"left\">" . $data['os_license_id'] . "<br />" . $data['os_license_number'] . "</td>
|
|
290 |
<td align=\"left\">" . $data['os_license_id'] . " " . $data['otherserial'] . "<br />" . $data['os_license_number'] . " " . $data['otherserial'] . "</td>
|
|
288 | 291 |
<td>" . $data['nbpc'] . "</td> |
289 | 292 |
<td>" . $data['nbusers'] . "</td> |
290 | 293 |
<td> |
... | ... | |
327 | 330 |
|
328 | 331 |
global $DB; |
329 | 332 |
|
330 |
$query = "SELECT glpi_profiles.name AS name,glpi_users_profiles.FK_entities as FK_entities FROM glpi_profiles,glpi_users_profiles,glpi_users WHERE glpi_users_profiles.FK_users='" . $glpiid . "' AND glpi_users_profiles.FK_profiles=glpi_profiles.ID AND glpi_users.FK_entities=glpi_users_profiles.FK_entities GROUP BY FK_entities";
|
|
333 |
$query = "SELECT glpi_profiles.name AS name,glpi_users_profiles.FK_entities as FK_entities FROM glpi_profiles,glpi_users_profiles,glpi_users WHERE glpi_users_profiles.FK_users='" . $glpiid . "' AND glpi_users_profiles.FK_profiles=glpi_profiles.ID GROUP BY FK_entities"; |
|
331 | 334 |
|
332 | 335 |
//print $query; |
333 | 336 |
//exit; |
Formats disponibles : Unified diff