Skip to content

Commit 20ded9d

Browse files
JEALGJEALG
committed
Correction problème création équipement
1 parent 192e7e9 commit 20ded9d

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

‎core/class/Free_CreateEq.class.php

+17-19
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private static function createEq_airmedia($logicalinfo, $templatecore_V4, $order
222222
}
223223
}
224224

225-
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['airmediaName'], $logicalinfo['airmediaID'], 'multimedia', false, null, null, null, '*/5 * * * *', null, null, null, 'system', true);
225+
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['airmediaName'], $logicalinfo['airmediaID'], 'multimedia', false, null, null, null, '*/5 * * * *', null, null, 'system', true);
226226
$receivers = $EqLogic->AddCommand('Player AirMedia choisi', 'receivers_info', 'info', 'string', 'default', null, null, 0, 'default', 'default', 0, null, 0, 'default', 'default', $order++, '0', false, true);
227227
$EqLogic->AddCommand('Choix du Player AirMedia', 'receivers', 'action', 'select', null, null, null, 1, $receivers, 'default', $receivers_icon, null, 0, 'default', 'default', $order++, '0', false, true, null, null, null, null, null, null, null, null, null, null, $receivers_list, null, null);
228228

@@ -272,7 +272,7 @@ private static function createEq_connexion($logicalinfo, $templatecore_V4, $orde
272272
$_bandwidth_value_up = '#value# / 1000000';
273273
$_bandwidth_up_unit = 'Mb/s';
274274
}
275-
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, null, null, 'system', true);
275+
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, null, 'system', true);
276276
$Connexion->AddCommand('Débit descendant', 'rate_down', 'info', 'numeric', $templatecore_V4 . 'badge', 'Ko/s', null, 1, 'default', 'default', 0, $iconspeed, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, '#value# / 1024', '2');
277277
$Connexion->AddCommand('Débit montant', 'rate_up', 'info', 'numeric', $templatecore_V4 . 'badge', 'Ko/s', null, 1, 'default', 'default', 0, $iconspeed, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, '#value# / 1024', '2', null, null, null, null, true);
278278
$Connexion->AddCommand('Débit descendant (max)', 'bandwidth_down', 'info', 'numeric', $templatecore_V4 . 'badge', $_bandwidth_down_unit, null, 1, 'default', 'default', 0, $iconspeed, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, $_bandwidth_value_down, '2');
@@ -299,7 +299,7 @@ private static function createEq_connexion_FTTH($logicalinfo, $templatecore_V4,
299299
{
300300
$updateicon = false;
301301
if ($result = ! null) {
302-
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, null, 'system', true);
302+
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, 'system', true);
303303
if (isset($result['link_type'])) {
304304
$Connexion->AddCommand('Type de connexion Fibre', 'link_type', 'info', 'string', $templatecore_V4 . 'line', null, null, 1, 'default', 'default', 0, null, 0, 'default', 'default', $order++, '0', $updateicon, true, null, null, null, null, null, null, null, null, null, true);
305305
} else {
@@ -323,7 +323,7 @@ private static function createEq_connexion_4G($logicalinfo, $templatecore_V4, $o
323323
if ($result != false && $result != 'Aucun module 4G détecté') {
324324
$_modul = 'Module 4G : Présent';
325325
log::add('Freebox_OS', 'debug', '| ───▶︎ ' . $_modul);
326-
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, null, 'system', true);
326+
$Connexion = Freebox_OS::AddEqLogic($logicalinfo['connexionName'], $logicalinfo['connexionID'], 'default', false, null, null, '*/15 * * * *', null, null, 'system', true);
327327
log::add('Freebox_OS', 'debug', '[WARNING] - DEBUT CREATION DES COMMANDES POUR LA 4G : ' . $logicalinfo['connexionName']);
328328
$Connexion->AddCommand('Débit xDSL Descendant', 'tx_used_rate_xdsl', 'info', 'numeric', $templatecore_V4 . 'badge', 'ko/s', null, 1, 'default', 'default', 0, null, 0, 'default', 'default', $order++, '0', null, true, null, null, null, '#value# / 1000', '2', null, null, null, null, true);
329329
$Connexion->AddCommand('Débit xDSL Montant', 'rx_used_rate_xdsl', 'info', 'numeric', $templatecore_V4 . 'badge', 'ko/s', null, 1, 'default', 'default', 0, null, 0, 'default', 'default', $order++, '0', null, true, null, null, null, '#value# / 1000', '2', null, null, null, null, true);
@@ -341,7 +341,7 @@ private static function createEq_connexion_4G($logicalinfo, $templatecore_V4, $o
341341
private static function createEq_disk_check($logicalinfo)
342342
{
343343
log::add('Freebox_OS', 'debug', '┌── :fg-success:Début de création des commandes pour ::/fg: ' . $logicalinfo['diskName'] . ' ──');
344-
Freebox_OS::AddEqLogic($logicalinfo['diskName'], $logicalinfo['diskID'], 'default', false, null, null, null, '5 */12 * * *', null, null, null, 'system', true);
344+
Freebox_OS::AddEqLogic($logicalinfo['diskName'], $logicalinfo['diskID'], 'default', false, null, null, null, '5 */12 * * *', null, null, 'system', true);
345345
log::add('Freebox_OS', 'debug', '└────────────────────');
346346
}
347347

@@ -370,7 +370,7 @@ private static function createEq_disk_SP($logicalinfo, $templatecore_V4, $order
370370
$result = $Free_API->universal_get('universalAPI', null, null, 'storage/disk', true, true, true);
371371
}
372372
if ($result != false) {
373-
$disk = Freebox_OS::AddEqLogic($logicalinfo['diskName'], $logicalinfo['diskID'], 'default', false, null, null, null, '5 */12 * * *', null, null, null, 'system', true);
373+
$disk = Freebox_OS::AddEqLogic($logicalinfo['diskName'], $logicalinfo['diskID'], 'default', false, null, null, null, '5 */12 * * *', null, null, 'system', true);
374374
foreach ($result['result'] as $disks) {
375375
if ($disks['temp'] != 0) {
376376
log::add('Freebox_OS', 'debug', '| ───▶︎ Température : ' . $disks['temp'] . '°C' . '- Disque [' . $disks['serial'] . '] - ' . $disks['id']);
@@ -445,7 +445,7 @@ private static function createEq_download($logicalinfo, $templatecore_V4, $order
445445
$iconDownloadsnormal = 'fas fa-rocket icon_green';
446446
$updateicon = true;
447447

448-
$downloads = Freebox_OS::AddEqLogic($logicalinfo['downloadsName'], $logicalinfo['downloadsID'], 'multimedia', false, null, null, null, '5 */12 * * *', null, null, null, 'system', true);
448+
$downloads = Freebox_OS::AddEqLogic($logicalinfo['downloadsName'], $logicalinfo['downloadsID'], 'multimedia', false, null, null, null, '5 */12 * * *', null, null, 'system', true);
449449
$downloads->AddCommand('Nb de tâche(s)', 'nb_tasks', 'info', 'numeric', $templatecore_V4 . 'line', null, null, 1, 'default', 'default', 0, $icontask, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, null, null, null, null, null, null, true, null, null, null, null, null, null, null, null, null, null);
450450
$downloads->AddCommand('Nb de tâche(s) active', 'nb_tasks_active', 'info', 'numeric', $templatecore_V4 . 'line', null, null, 1, 'default', 'default', 0, $icontask, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, null, null, null, null, null, null, true, null, null, null, null, null, null, null, null, null, null);
451451
$downloads->AddCommand('Nb de tâche(s) en extraction', 'nb_tasks_extracting', 'info', 'numeric', $templatecore_V4 . 'line', null, null, 1, 'default', 'default', 0, $icontask, 0, 'default', 'default', $order++, '0', $updateicon, true, null, true, null, null, null, null, null, null, null, true, null, null, null, null, null, null, null, null, null, null);
@@ -482,11 +482,9 @@ private static function createEq_FreePlug($logicalinfo, $templatecore_V4, $order
482482
foreach ($result['result'] as $freeplugs) {
483483
foreach ($freeplugs['members'] as $freeplug) {
484484
log::add('Freebox_OS', 'debug', '| ───▶︎ Création Freeplug : ' . $freeplug['id']);
485-
$FreePlug = Freebox_OS::AddEqLogic($logicalinfo['freeplugName'] . ' - ' . $freeplug['id'], $freeplug['id'], 'default', true, $logicalinfo['freeplugID'], null, null, '*/5 * * * *', null, null, null, 'system');
485+
$FreePlug = Freebox_OS::AddEqLogic($logicalinfo['freeplugName'] . ' - ' . $freeplug['id'], $freeplug['id'], 'default', true, $logicalinfo['freeplugID'], null, null, '*/5 * * * *', null, null, 'system');
486486
$FreePlug->AddCommand('Rôle', 'net_role', 'info', 'string', $templatecore_V4 . 'line', null, 'default', 0, 'default', 'default', 0, 'default', 0, 'default', 'default', 10, '0', $updateicon, false, false, true);
487487
$FreePlug->AddCommand('Redémarrer', 'reset', 'action', 'other', $templatecore_V4 . 'line', null, null, 1, 'default', 'default', 0, $iconReboot, 0, 'default', 'default', 1, '0', true, false, null, true);
488-
//$FreePlug->AddCommand('Débit TX', 'tx_rate', 'info', 'numeric', $templatecore_V4 . 'line', 'Mb/s', 'default', 0, 'default', 'default', 0, 'default', 0, 'default', 'default', 12, '0', $updateicon, false, false, true);
489-
//$FreePlug->AddCommand('Débit RX', 'rx_rate', 'info', 'numeric', $templatecore_V4 . 'line', 'Mb/s', 'default', 0, 'default', 'default', 0, 'default', 0, 'default', 'default', 12, '0', $updateicon, false, false, true);
490488
}
491489
}
492490
}
@@ -495,7 +493,7 @@ private static function createEq_FreePlug($logicalinfo, $templatecore_V4, $order
495493
private static function createEq_LCD($logicalinfo, $templatecore_V4, $order = 0)
496494
{
497495
log::add('Freebox_OS', 'debug', '┌── :fg-success:Début de création des commandes pour ::/fg: ' . $logicalinfo['LCDName'] . ' ──');
498-
$LCD = Freebox_OS::AddEqLogic($logicalinfo['LCDName'], $logicalinfo['LCDID'], 'default', false, null, null, null, '5 */12 * * *', null, null, null, 'system', true);
496+
$LCD = Freebox_OS::AddEqLogic($logicalinfo['LCDName'], $logicalinfo['LCDID'], 'default', false, null, null, null, '5 */12 * * *', null, null, 'system', true);
499497
$iconbrightness = 'fas fa-adjust icon_green';
500498
$iconorientation = 'fas fa-map-signs icon_green';
501499
$updateicon = false;
@@ -536,7 +534,7 @@ private static function createEq_parental($logicalinfo, $templatecore_V4, $order
536534
$category = 'default';
537535
$Equipement['name'] = preg_replace('/\'+/', ' ', $Equipement['name']); // Suppression '
538536
log::add('Freebox_OS', 'debug', '| ───▶︎ Nom du controle parental : ' . $Equipement['name']);
539-
$parental = Freebox_OS::AddEqLogic($Equipement['name'], 'parental_' . $Equipement['id'], $category, true, 'parental', null, $Equipement['id'], '*/5 * * * *', null, null, null, 'parental_controls');
537+
$parental = Freebox_OS::AddEqLogic($Equipement['name'], 'parental_' . $Equipement['id'], $category, true, 'parental', null, $Equipement['id'], '*/5 * * * *', null, null, 'parental_controls');
540538
$StatusParental = $parental->AddCommand('Etat', 'current_mode', "info", 'string', $Templateparent, null, null, 1, '', '', '', '', 0, 'default', 'default', $order++, '0', false, true, null, true, null, null, null, null, null, null, null, true);
541539
$parental->AddCommand('Autoriser', 'allowed', 'action', 'other', null, null, null, 1, $StatusParental, 'parentalStatus', 0, $iconparent_allowed, 0, 'default', 'default', $order++, '0', false, false, null, true);
542540
$parental->AddCommand('Bloquer', 'denied', 'action', 'other', null, null, null, 1, $StatusParental, 'parentalStatus', 0, $iconparent_denied, 0, 'default', 'default', $order++, '0', false, false, null, true);
@@ -561,7 +559,7 @@ private static function createEq_phone($logicalinfo, $templatecore_V4, $order =
561559
$iconRead_call = 'fab fa-readme icon_blue';
562560
$updateicon = false;
563561

564-
$phone = Freebox_OS::AddEqLogic($logicalinfo['phoneName'], $logicalinfo['phoneID'], 'default', false, null, null, null, '*/30 * * * *', null, null, null, 'system', true);
562+
$phone = Freebox_OS::AddEqLogic($logicalinfo['phoneName'], $logicalinfo['phoneID'], 'default', false, null, null, null, '*/30 * * * *', null, null, 'system', true);
565563
$phone->AddCommand('Nb Manqués', 'missed', 'info', 'numeric', $templatecore_V4 . 'badge', null, null, 1, 'default', 'default', 0, $iconmissed, 1, 'default', 'default', $order++, '0', $updateicon, true, false, true, null, null, null, null);
566564
$phone->AddCommand('Liste Manqués', 'listmissed', 'info', 'string', null, null, null, 1, 'default', 'default', 0, $iconmissed, 1, 'default', 'default', $order++, '0', $updateicon, true, false, null, null, null, null, 'NONAME');
567565
$phone->AddCommand('Nb Reçus', 'accepted', 'info', 'numeric', $templatecore_V4 . 'badge', null, null, 1, 'default', 'default', 0, $iconaccepted, 1, 'default', 'default', $order++, '0', $updateicon, true, false, true, null, null, null, null);
@@ -586,7 +584,7 @@ private static function createEq_management($logicalinfo, $templatecore_V4, $ord
586584
// Pour test Visibilité
587585
$_IsVisible = 0;
588586

589-
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['managementName'], $logicalinfo['managementID'], 'default', false, null, null, null, '0 0 1 1 *', null, null, null, 'system', true, null);
587+
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['managementName'], $logicalinfo['managementID'], 'default', false, null, null, null, '0 0 1 1 *', null, null, 'system', true, null);
590588
// Type de phériphérique
591589
$host_type_list = "other|Autre;ip_camera|Caméra IP;vg_console|Console de jeux;freebox_crystal|Freebox Crystal;freebox_delta|Freebox Delta;freebox_hd|Freebox HD;freebox_mini|Freebox Mini;freebox_one|Freebox One;freebox_player|Freebox Player;freebox_pop|Freebox Pop;freebox_wifi|Freebox Wi-Fi Pop;printer|Imprimante;nas|NAS;workstation|Ordinateur Fixe;laptop|Ordinateur Portable;multimedia_device|Périphérique multimédia;networking_device|Périphérique réseau;smartphone|Smartphone;tablet|Tablette;ip_phone|Téléphone IP;television|Télévision;car|Véhicule connecté";
592590
$host_type = $EqLogic->AddCommand('Type de périphérique choisi', 'host_type_info', 'info', 'string', 'default', null, null, $_IsVisible, 'default', 'default', 0, $icon_host_type, 0, 'default', 'default', $order, '0', false, true, null, true);
@@ -659,7 +657,7 @@ private static function createEq_netshare($logicalinfo, $templatecore_V4)
659657
$color_off = ' icon_red';
660658
$updateicon = false;
661659

662-
$netshare = Freebox_OS::AddEqLogic($logicalinfo['netshareName'], $logicalinfo['netshareID'], 'multimedia', false, null, null, null, '5 */12 * * *', null, null, null, 'system', true);
660+
$netshare = Freebox_OS::AddEqLogic($logicalinfo['netshareName'], $logicalinfo['netshareID'], 'multimedia', false, null, null, null, '5 */12 * * *', null, null, 'system', true);
663661
$boucle_num = 1; // 1 = Partage Imprimante - 2 = Partage de fichiers Windows - 3 = Partage Fichier Mac - 4 = Partage Fichier FTP
664662
$order = 1;
665663
while ($boucle_num <= 5) {
@@ -850,7 +848,7 @@ private static function createEq_network_SP($logicalinfo, $templatecore_V4, $ord
850848
$_IsVisible = 0;
851849
//$_networkname = $logicalinfo['managementName'];
852850
log::add('Freebox_OS', 'debug', '| :fg-success:───▶︎ Ajout des commandes spécifiques pour l\'équipement : ' . $logicalinfo['managementName'] . ':/fg:');
853-
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['managementName'], $logicalinfo['managementID'], 'default', false, null, null, null, '0 0 1 1 *', null, null, null, 'system', true, null);
851+
$EqLogic = Freebox_OS::AddEqLogic($logicalinfo['managementName'], $logicalinfo['managementID'], 'default', false, null, null, null, '0 0 1 1 *', null, null, 'system', true, null);
854852
$host_type = $EqLogic->AddCommand('Appareil connecté choisi', 'host_info', 'info', 'string', 'default', null, null, $_IsVisible, 'default', 'default', 0, $icon_network, 0, 'default', 'default', 14, '0', false, true, null, true);
855853
$EqLogic->AddCommand('Sélection appareil connecté', 'host', 'action', 'select', null, null, null, $_IsVisible, $host_type, 'default', 0, $icon_network, 0, 'default', 'default', 15, '0', false, true, null, true, null, null, null, null, null, null, null, null, $network_list, null, null);
856854
$EqLogic->refreshWidget();
@@ -870,7 +868,7 @@ private static function createEq_notification($logicalinfo, $templatecore_V4, $o
870868
private static function createEq_system_full($logicalinfo, $templatecore_V4, $order = 0)
871869
{
872870
log::add('Freebox_OS', 'debug', '┌── :fg-success:Début de création des commandes pour ::/fg: ' . $logicalinfo['systemName'] . ' ──');
873-
$system = Freebox_OS::AddEqLogic($logicalinfo['systemName'], $logicalinfo['systemID'], 'default', false, null, null, null, '*/30 * * * *', null, null, null, 'system', true);
871+
$system = Freebox_OS::AddEqLogic($logicalinfo['systemName'], $logicalinfo['systemID'], 'default', false, null, null, null, '*/30 * * * *', null, null, 'system', true);
874872
$order = 10;
875873
Free_CreateEq::createEq_system($logicalinfo, $templatecore_V4, $order, $system);
876874
$order = 1;
@@ -1090,7 +1088,7 @@ private static function createEq_VM($logicalinfo, $templatecore_V4, $order = 0)
10901088
} else {
10911089
$VM_name = 'VM_' . $Equipement['id'];
10921090
}
1093-
$_VM = Freebox_OS::AddEqLogic($VM_name, 'VM_' . $Equipement['id'], 'multimedia', true, 'VM', null, $Equipement['id'], '*/5 * * * *', null, null, null, 'system', true);
1091+
$_VM = Freebox_OS::AddEqLogic($VM_name, 'VM_' . $Equipement['id'], 'multimedia', true, 'VM', null, $Equipement['id'], '*/5 * * * *', null, null, 'system', true);
10941092
$_VM->AddCommand('Status', 'status', 'info', 'string', $TemplateVM, null, 'default', 1, 'default', 'default', 0, $VMstatus, 0, 'default', 'default', $order++, '0', $updateicon, false, false, true, null, null, null, null, null, null, null, true);
10951093
$_VM->AddCommand('Start', 'start', 'action', 'other', 'default', null, 'default', 1, 'default', 'default', 0, $VMOn, 0, 'default', 'default', $order++, '0', $updateicon, false);
10961094
$_VM->AddCommand('Stop', 'stop', 'action', 'other', 'default', null, 'default', 1, 'default', 'default', 0, $VMOff, 0, 'default', 'default', $order++, '0', $updateicon, false);
@@ -1123,7 +1121,7 @@ private static function createEq_wifi($logicalinfo, $templatecore_V4, $order = 0
11231121
$iconWifiWPSOn = 'fas fa-ethernet icon_green';
11241122
$iconWifiWPSOff = 'fas fa-ethernet icon_red';
11251123

1126-
$Wifi = Freebox_OS::AddEqLogic($logicalinfo['wifiName'], $logicalinfo['wifiID'], 'default', false, null, null, null, '*/5 * * * *', null, null, null, 'system', true, null);
1124+
$Wifi = Freebox_OS::AddEqLogic($logicalinfo['wifiName'], $logicalinfo['wifiID'], 'default', false, null, null, null, '*/5 * * * *', null, null, 'system', true, null);
11271125
$StatusWifi = $Wifi->AddCommand('Etat Wifi', 'wifiStatut', "info", 'binary', null, null, 'ENERGY_STATE', 0, '', '', '', '', 0, 'default', 'default', 1, 1, $updateicon, true);
11281126
$Wifi->AddCommand('Wifi On', 'wifiOn', 'action', 'other', $TemplateWifiOnOFF, null, 'ENERGY_ON', 1, $StatusWifi, 'wifiStatut', 0, $iconWifiOn, 0, 'default', 'default', 10, '0', $updateicon, false);
11291127
$Wifi->AddCommand('Wifi Off', 'wifiOff', 'action', 'other', $TemplateWifiOnOFF, null, 'ENERGY_OFF', 1, $StatusWifi, 'wifiStatut', 0, $iconWifiOff, 0, 'default', 'default', 11, '0', $updateicon, false);

0 commit comments

Comments
 (0)