Fix issue #4

NextDom · Jan 29, 2019 · 35edb03 · 35edb03
1 parent f5d862d
commit 35edb03
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 237 deletions.
diff --git a/core/ajax/meross.ajax.php b/core/ajax/meross.ajax.php
@@ -2,7 +2,6 @@
 
 /*
  * This file is part of the NextDom software (https://github.com/NextDom or http://nextdom.github.io).
- * Copyright (c) 2018 NextDom.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,22 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* This file is part of NextDom.
-*
-* NextDom is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* NextDom is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
-*/
-
 /**
  * Fichier appelé lorsque le plugin effectue une requête Ajax
  */
@@ -71,4 +54,4 @@
 } catch (\Exception $e) {
     // Affiche l'exception levé à l'utilisateur
     ajax::error(displayExeption($e), $e->getCode());
-}
+}
diff --git a/core/class/meross.class.php b/core/class/meross.class.php
diff --git a/core/class/merossCmd.class.php b/core/class/merossCmd.class.php
@@ -1,37 +1,21 @@
 <?php
 
-/* This file is part of Jeedom.
+/*
+ * This file is part of the NextDom software (https://github.com/NextDom or http://nextdom.github.io).
  *
- * Jeedom is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 2.
  *
- * Jeedom is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* This file is part of NextDom.
-*
-* NextDom is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* NextDom is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
-*/
-
 require_once __DIR__ . '/../../../../core/php/core.inc.php';
 
 class merossCmd extends cmd
@@ -45,7 +29,7 @@ public function execute($_options = array())
         $password = config::byKey('merossPassword', 'meross');
 
         // Base cmd
-        $command = 'sudo sh ' . __DIR__ . '/../../3rdparty/meross.sh' . ' --email ' . $email . ' --password ' . $password . ' --uuid ' . $eqLogic->getLogicalId() . ' --show ';
+        $command = 'sh ' . __DIR__ . '/../../3rdparty/meross.sh' . ' --email ' . $email . ' --password ' . $password . ' --uuid ' . $eqLogic->getLogicalId() . ' --show ';
 
         // If action need to be executed
         $execute = false;
@@ -73,10 +57,10 @@ public function execute($_options = array())
             log::add('meross','debug','shell_exec: ' . $log);
             $result = trim(shell_exec($command));
             log::add('meross','debug','shell_exec: result: ' . $result);
-            $eqLogic->updateInfo($result);
+            meross::updateInfo($eqLogic, $result);
         } else {
             log::add('meross','debug','action: Action=' . $action . ' not implemented. ');
         }
 
     }
-}
+}
diff --git a/desktop/js/meross.js b/desktop/js/meross.js
@@ -1,6 +1,5 @@
 /*
  * This file is part of the NextDom software (https://github.com/NextDom or http://nextdom.github.io).
- * Copyright (c) 2018 NextDom.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,22 +14,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* This file is part of NextDom.
-*
-* NextDom is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* NextDom is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
-*/
-
 
 $("#table_cmd").sortable({
     axis: "y",

diff --git a/desktop/modal/health.php b/desktop/modal/health.php
@@ -1,18 +1,19 @@
 <?php
-/* This file is part of Jeedom.
+
+/*
+ * This file is part of the NextDom software (https://github.com/NextDom or http://nextdom.github.io).
  *
- * Jeedom is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 2.
  *
- * Jeedom is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!isConnect('admin')) {

diff --git a/desktop/php/meross.php b/desktop/php/meross.php
@@ -1,7 +1,6 @@
 <?php
 /*
  * This file is part of the NextDom software (https://github.com/NextDom or http://nextdom.github.io).
- * Copyright (c) 2018 NextDom.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,22 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* This file is part of NextDom.
-*
-* NextDom is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* NextDom is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
-*/
-
 if (!isConnect('admin')) {
     throw new \Exception('{{401 - Accès non autorisé}}');
 }

diff --git a/plugin_info/configuration.php b/plugin_info/configuration.php
@@ -22,35 +22,36 @@
 include_file('core', 'authentification', 'php');
 
 if (!isConnect()) {
-  include_file('desktop', '404', 'php');
-   die();
+    include_file('desktop', '404', 'php');
+    die();
 }
 
 ?>
 
 <form class="form-horizontal">
-<fieldset>
-    <div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
-      <div class="form-group">
-        <label for="merossEmail">{{Email}}</label>
-        <div class="input-group">
-          <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
-          <input type="email" class="configKey form-control" placeholder="{{Email de votre compte Meross}}" data-l1key="merossEmail" id="merossEmail">
+    <fieldset>
+        <div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
+            <div class="form-group">
+                <label for="merossEmail">{{Email}}</label>
+                <div class="input-group">
+                    <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+                    <input type="email" class="configKey form-control" placeholder="{{Email de votre compte Meross}}"
+                        data-l1key="merossEmail" id="merossEmail">
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
 
-    <br>
-
-    <div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
-      <div class="form-group">
-        <label for="merossPassword">{{Mot de passe}}</label>
-        <div class="input-group">
-          <span class="input-group-addon"><i class="fas fa-key"></i></span>
-          <input type="password" class="configKey form-control" placeholder="{{Mot de passe associé}}"data-l1key="merossPassword" id="merossPassword">
+        <br>
+
+        <div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
+            <div class="form-group">
+                <label for="merossPassword">{{Mot de passe}}</label>
+                <div class="input-group">
+                    <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                    <input type="password" class="configKey form-control" placeholder="{{Mot de passe associé}}"
+                        data-l1key="merossPassword" id="merossPassword">
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </fieldset>
-</form>
-
+    </fieldset>
+</form>
diff --git a/plugin_info/install.php b/plugin_info/install.php
@@ -64,7 +64,7 @@ function Meross_remove()
 
 /**
  * Remove __pycache__ from 3rdparty folders
- * 
+ *
  * @return void
  */
 function cleanPyCache()
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ function Meross_remove() @@
     /**
      * Remove __pycache__ from 3rdparty folders
-     *
+     *
      * @return void
      */
     function cleanPyCache()
@@ Expand Down @@