Skip to content

Commit

Permalink
fix: detectedLte return bool or "scan"
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mips2648
Mips2648 committed Apr 17, 2024
1 parent d62fdcc commit 6df36ff
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 160 deletions.
33 changes: 16 additions & 17 deletions core/class/luna.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ public static function saveWifi($data, $interface = 1) {
} else if ($wifiMode == "hotspot") {
log::add(__CLASS__, 'debug', 'save wifi >>hotspot');
self::cleanWifi($device);
log::add(__CLASS__, 'debug', 'save wifi >>sudo nmcli device wifi hotspot ssid "'.$wifiHotspotName.'" password "'.$wifiHotspotPwd.'" ifname wlan' . $device . ' con-name Hotspot-wlan' . $device);
shell_exec('sudo nmcli device wifi hotspot ssid "'.$wifiHotspotName.'" password "'.$wifiHotspotPwd.'" ifname wlan' . $device . ' con-name Hotspot-wlan' . $device);
if($wifiHotspotdhcp == true){
log::add(__CLASS__, 'debug', 'save wifi >>sudo nmcli device wifi hotspot ssid "' . $wifiHotspotName . '" password "' . $wifiHotspotPwd . '" ifname wlan' . $device . ' con-name Hotspot-wlan' . $device);
shell_exec('sudo nmcli device wifi hotspot ssid "' . $wifiHotspotName . '" password "' . $wifiHotspotPwd . '" ifname wlan' . $device . ' con-name Hotspot-wlan' . $device);
if ($wifiHotspotdhcp == true) {
log::add(__CLASS__, 'debug', 'save wifi >> sudo nmcli con modify Hotspot-wlan' . $device . ' ipv4.addresses ' . luna::convertIP($wifiHotspotip, $wifiHotspotmask));
shell_exec('sudo nmcli con modify Hotspot-wlan' . $device . ' ipv4.addresses ' . luna::convertIP($wifiHotspotip, $wifiHotspotmask));
}
Expand Down Expand Up @@ -560,12 +560,12 @@ public static function patchLuna() {


public static function mountPersistent() {
$fstabContent = shell_exec('cat /etc/fstab');
$addPersistent = "/dev/mmcblk2 /media auto defaults,nofail 0 0";
if (strpos($fstabContent, $addPersistent) === false) {
$fstabContent .= "\n" . $addPersistent;
shell_exec("echo '$fstabContent' | sudo tee /etc/fstab");
}
$fstabContent = shell_exec('cat /etc/fstab');
$addPersistent = "/dev/mmcblk2 /media auto defaults,nofail 0 0";
if (strpos($fstabContent, $addPersistent) === false) {
$fstabContent .= "\n" . $addPersistent;
shell_exec("echo '$fstabContent' | sudo tee /etc/fstab");
}
}

public static function partitionSD() {
Expand All @@ -589,7 +589,6 @@ public static function checkPartitionSD() {
if ($valueVolume['name'] === 'mmcblk2' && $valueVolume['fstype'] === 'ext3') {
log::add(__CLASS__, 'debug', 'JSON VOLUME > trouvé');
$response = true;

}
}
return $response;
Expand Down Expand Up @@ -783,17 +782,17 @@ public static function installLte() {

public static function configjsonlte() {
log::add(__CLASS__, 'debug', 'CONFIG JSON LTE' . luna::detectedLte());
if (luna::detectedLte() === 'false') {
if (luna::detectedLte() === false) {
log::add(__CLASS__, 'debug', 'FAUX');
return false;
return;
}
if (luna::detectedLte() === 'scan') {
log::add(__CLASS__, 'debug', 'FAUX SCAN');
return false;
return;
}
$luna = eqLogic::byLogicalId('wifi', __CLASS__);
if (!is_object($luna)) {
return false;
return;
}
$apn = $luna->getConfiguration('lteApn');
$user = $luna->getConfiguration('lteUser');
Expand Down Expand Up @@ -902,10 +901,10 @@ public static function recuperationConfigModem() {
];
}

public static function cronHourly(){
public static function cronHourly() {
// executer LTE si pas de ppp0 dans un ifconfig
$ifconfig = shell_exec('sudo ifconfig');
if(strpos($ifconfig, 'ppp0') === false){
if (strpos($ifconfig, 'ppp0') === false) {
luna::configjsonlte();
}
}
Expand All @@ -914,7 +913,7 @@ public static function cronHourly(){

/* ----- DEBUT SMS ----- */

public static function listGlobalSMS(){
public static function listGlobalSMS() {
$list = self::listSMS();
$return = [];
foreach ($list as $sms) {
Expand Down
264 changes: 132 additions & 132 deletions desktop/php/lte.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,175 +14,175 @@
$portSmsLuna = "/dev/ttyLuna-Lte";
?>
<div role="tabpanel" class="tab-pane" id="LTEtab"><br />
<form id="ltePanel" class="form-horizontal">
<fieldset>
<legend><i class="fa fa-signal"></i> {{LTE}}</legend>
<?php
if(luna::detectedLte() == "true"){
?>
<div class="row">
<div class="col-sm-6">
<h3><i class="fa fa-comments"></i> {{Configuration SMS}}</h3>
<?php
if(is_object($sms)){
$portSms = config::byKey('port', 'sms');
$pinSMS = config::byKey('pin', 'sms');
$pinLte = config::byKey('ltePin', 'luna');
if($portSms == ''){
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Le port du plugin SMS n\'est pas configuré}}</div>';
}else{
if($portSms != $portSmsLuna){
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Le port du plugin SMS n\'est pas configuré sur le port de la Luna}} : '.$portSmsLuna.' <a class="btn btn-info" style="float: right;" id="bt_changePortSms"><i class="fas fa-check-circle"></i> {{Changer Automatiquement}}</a></div>';
}
$eqLogics = eqLogic::byType('sms');
if(count($eqLogics) == 0){
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Aucun équipement SMS n\'est configuré}}</div>';
}else{
echo '<div class="alert alert-success"><i class="fas fa-check-circle"></i> {{Le plugin SMS est configuré}}</div>';
}
?>
<div class="form-group">
<label class="col-lg-3 control-label">{{Port Plugin SMS}}
<sup><i class="fas fa-question-circle tooltips" title="{{Port a configurer dans le plugin SMS}}"></i></sup>
</label>
<div class="col-lg-4">
<input value="<?php echo $portSms; ?>" disabled/>
<form id="ltePanel" class="form-horizontal">
<fieldset>
<legend><i class="fa fa-signal"></i> {{LTE}}</legend>
<?php
if (luna::detectedLte() === true) {
?>
<div class="row">
<div class="col-sm-6">
<h3><i class="fa fa-comments"></i> {{Configuration SMS}}</h3>
<?php
if (is_object($sms)) {
$portSms = config::byKey('port', 'sms');
$pinSMS = config::byKey('pin', 'sms');
$pinLte = config::byKey('ltePin', 'luna');
if ($portSms == '') {
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Le port du plugin SMS n\'est pas configuré}}</div>';
} else {
if ($portSms != $portSmsLuna) {
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Le port du plugin SMS n\'est pas configuré sur le port de la Luna}} : ' . $portSmsLuna . ' <a class="btn btn-info" style="float: right;" id="bt_changePortSms"><i class="fas fa-check-circle"></i> {{Changer Automatiquement}}</a></div>';
}
$eqLogics = eqLogic::byType('sms');
if (count($eqLogics) == 0) {
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Aucun équipement SMS n\'est configuré}}</div>';
} else {
echo '<div class="alert alert-success"><i class="fas fa-check-circle"></i> {{Le plugin SMS est configuré}}</div>';
}
?>
<div class="form-group">
<label class="col-lg-3 control-label">{{Port Plugin SMS}}
<sup><i class="fas fa-question-circle tooltips" title="{{Port a configurer dans le plugin SMS}}"></i></sup>
</label>
<div class="col-lg-4">
<input value="<?php echo $portSms; ?>" disabled />
</div>
</div>
</div>
<?php
if($pinSMS != $ltePin){
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Les Codes Pin entre les deux plugins sont different.}}</div>';
<?php
if ($pinSMS != $ltePin) {
echo '<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Les Codes Pin entre les deux plugins sont different.}}</div>';
}
}
} else {
echo '<div class="alert alert-danger"><i class="fas fa-exclamation-triangle"></i> {{Le plugin SMS n\'est pas installé}}</div>';
}
}else{
echo '<div class="alert alert-danger"><i class="fas fa-exclamation-triangle"></i> {{Le plugin SMS n\'est pas installé}}</div>';
}
?>
</div>
<div class="col-sm-6">
<h3><i class="fa fa-signal"></i> {{Configuration LTE}}</h3>
<div class="alert alert-warning">
<i class="fas fa-exclamation-triangle"></i> {{Uniquement si vous avez une carte SIM LTE avec data}}
</div>
<div class="form-group">
<div class="col-lg-3">
</div>
<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display : none;" />
</div>
<div class="form-group">
<label class="col-lg-3 control-label">*{{APN}}
<sup><i class="fas fa-question-circle tooltips" title="{{APN pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteApn" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Utilisateur}}
<sup><i class="fas fa-question-circle tooltips" title="{{User pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteUser" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Mot de passe}}
<sup><i class="fas fa-question-circle tooltips" title="{{Password pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="ltePassword" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Code Pin}}
<sup><i class="fas fa-question-circle tooltips" title="{{ne rien mettre si pas de code pin}}"></i></sup>
</label>
<div class="col-lg-2">
<input class="eqLogicAttr form-control" type="number" data-l1key="configuration" data-l2key="ltePin" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Activation Data}}
<sup><i class="fas fa-question-circle tooltips" title="{{Prise en charge de la data via la connexion LTE, pour les sim avec data}}"></i></sup>
</label>
<div class="col-lg-4">
<input type="checkbox" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteActivation" checked/>
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Connexion LTE}}
<sup><i class="fas fa-question-circle tooltips" title="{{Verification si votre 4G est bien connecté}}"></i></sup>
</label>
<div class="col-lg-4 macLteCoche">
</div>
</div>
<br />
<div class="form-actions">
<label class="col-lg-3 control-label">{{Gestion LTE}}</label>
<div class="col-lg-4">
<a class="btn btn-info" id="bt_saveLTE"><i class="fas fa-check-circle"></i> *{{Re-Lancer}}</a>
?>
</div>
</div>
<br /><br /><br />
<i>*{{Seul l'apn est obligatoire}}</i>
<br /><br /><br />
<?php
$modem = luna::recuperationConfigModem();
<div class="col-sm-6">
<h3><i class="fa fa-signal"></i> {{Configuration LTE}}</h3>
<div class="alert alert-warning">
<i class="fas fa-exclamation-triangle"></i> {{Uniquement si vous avez une carte SIM LTE avec data}}
</div>
<div class="form-group">
<div class="col-lg-3">
</div>
<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display : none;" />
</div>
<div class="form-group">
<label class="col-lg-3 control-label">*{{APN}}
<sup><i class="fas fa-question-circle tooltips" title="{{APN pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteApn" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Utilisateur}}
<sup><i class="fas fa-question-circle tooltips" title="{{User pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteUser" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Mot de passe}}
<sup><i class="fas fa-question-circle tooltips" title="{{Password pour la partie LTE}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="ltePassword" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Code Pin}}
<sup><i class="fas fa-question-circle tooltips" title="{{ne rien mettre si pas de code pin}}"></i></sup>
</label>
<div class="col-lg-2">
<input class="eqLogicAttr form-control" type="number" data-l1key="configuration" data-l2key="ltePin" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Activation Data}}
<sup><i class="fas fa-question-circle tooltips" title="{{Prise en charge de la data via la connexion LTE, pour les sim avec data}}"></i></sup>
</label>
<div class="col-lg-4">
<input type="checkbox" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="lteActivation" checked />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Connexion LTE}}
<sup><i class="fas fa-question-circle tooltips" title="{{Verification si votre 4G est bien connecté}}"></i></sup>
</label>
<div class="col-lg-4 macLteCoche">
</div>
</div>
<br />
<div class="form-actions">
<label class="col-lg-3 control-label">{{Gestion LTE}}</label>
<div class="col-lg-4">
<a class="btn btn-info" id="bt_saveLTE"><i class="fas fa-check-circle"></i> *{{Re-Lancer}}</a>
</div>
</div>
<br /><br /><br />
<i>*{{Seul l'apn est obligatoire}}</i>
<br /><br /><br />
<?php
$modem = luna::recuperationConfigModem();
?>
<div class="form-group">
<label class="col-lg-3 control-label">{{IMEI}}
<sup><i class="fas fa-question-circle tooltips" title="{{IMEI de la Luna}}"></i></sup>
</label>
<div class="col-lg-4">
<input class="form-control" value="<?php echo $modem['imei']; ?>" disabled/>
<input class="form-control" value="<?php echo $modem['imei']; ?>" disabled />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Nom de l'opérateur}}
</label>
<div class="col-lg-4">
<input class="form-control" value="<?php echo $modem['operatorName']; ?>" disabled/>
<input class="form-control" value="<?php echo $modem['operatorName']; ?>" disabled />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Signal}}
</label>
<div class="col-lg-4">
<input class="form-control" value="<?php echo $modem['signalPercent']; ?>" disabled/>
<input class="form-control" value="<?php echo $modem['signalPercent']; ?>" disabled />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Etat}}
</label>
<div class="col-lg-4">
<input class="form-control" value="<?php echo $modem['state']; ?>" disabled/>
<input class="form-control" value="<?php echo $modem['stateFailedReason']; ?>" disabled/>
<input class="form-control" value="<?php echo $modem['state']; ?>" disabled />
<input class="form-control" value="<?php echo $modem['stateFailedReason']; ?>" disabled />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{{Deblocage SIM}}
</label>
<div class="col-lg-4">
<input class="form-control" value="<?php echo $modem['unlockRequired']; ?>" disabled/>
<input class="form-control" value="<?php json_encode($modem['unlockRetries']); ?>" disabled/>
<input class="form-control" value="<?php echo $modem['unlockRequired']; ?>" disabled />
<input class="form-control" value="<?php json_encode($modem['unlockRetries']); ?>" disabled />
</div>
</div>
</div>
</form>
</div>
<?php
}else{
?>
<div class="row">
<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Votre Luna n'as pas de module LTE integrer, le plugin prend en charge uniquement les Luna 4G.}}</div>
<center><a class="btn btn-info" id="bt_scanLTE">
<i class="fas fa-search"></i> {{Détection du module LTE}}</a></center>
</div>
<?php
}
?>
</fieldset>
</form>
</form>
</div>
<?php
} else {
?>
<div class="row">
<div class="alert alert-warning"><i class="fas fa-exclamation-triangle"></i> {{Votre Luna n'as pas de module LTE integrer, le plugin prend en charge uniquement les Luna 4G.}}</div>
<center><a class="btn btn-info" id="bt_scanLTE">
<i class="fas fa-search"></i> {{Détection du module LTE}}</a></center>
</div>
<?php
}
?>
</fieldset>
</form>
</div>


Expand Down
Loading

0 comments on commit 6df36ff

Please sign in to comment.