From 7c72f2794089a8deb1294a9015cd035eb9150227 Mon Sep 17 00:00:00 2001 From: Eric Quinton Date: Thu, 23 Sep 2021 12:24:42 +0200 Subject: [PATCH] =?UTF-8?q?:fix=20sonar:=20corrections=20suite=20=C3=A0=20?= =?UTF-8?q?analyse=20Sonar=20Scanner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/droits/groupChange.tpl | 1 - display/templates/main_js.tpl | 3 -- framework/common.inc.php | 27 --------------- framework/fonctions.php | 11 ++----- .../identification/identification.class.php | 27 +++++++-------- .../identification/loginGestion.class.php | 8 ++--- framework/identification/token.class.php | 11 ++++--- framework/log/log.class.php | 5 ++- framework/news.php | 4 +-- framework/objetbdd/ObjetBDD.php | 33 ++++++------------- framework/objetbdd/ObjetBDD_functions.php | 12 +++---- framework/utils/structure.php | 1 - framework/version | 4 +-- modules/classes/import/export.class.php | 14 ++++---- modules/classes/project.class.php | 6 ++-- modules/classes/tracking/detection.class.php | 4 +-- .../tracking/individual_tracking.class.php | 1 - modules/tracking/detection.php | 3 -- modules/tracking/individualTracking.php | 7 ---- modules/tracking/stationTracking.php | 1 - sonar-scanner.sh | 3 +- 21 files changed, 60 insertions(+), 126 deletions(-) diff --git a/display/templates/framework/droits/groupChange.tpl b/display/templates/framework/droits/groupChange.tpl index 6772a263..e71e881b 100644 --- a/display/templates/framework/droits/groupChange.tpl +++ b/display/templates/framework/droits/groupChange.tpl @@ -8,7 +8,6 @@ -
{if $data.aclgroup_id > 0 } diff --git a/display/templates/main_js.tpl b/display/templates/main_js.tpl index de54fa0e..e250945b 100644 --- a/display/templates/main_js.tpl +++ b/display/templates/main_js.tpl @@ -1,6 +1,5 @@ - @@ -14,8 +13,6 @@ - diff --git a/framework/common.inc.php b/framework/common.inc.php index 860b5641..2297812c 100644 --- a/framework/common.inc.php +++ b/framework/common.inc.php @@ -197,19 +197,6 @@ */ if (strlen($BDD_schema) > 0) { $bdd->exec("set search_path = " . $BDD_schema); - /* - * Positionnement des messages dans la langue courante - */ - /*switch ($LANG["date"]["locale"]) { - case "en": - $bdd->exec("set lc_messages to 'en_US.UTF-8'"); - break; - case "fr": - default: - $bdd->exec("set lc_messages to 'fr_FR.UTF-8'"); - break; - } - */ } /* * Connexion a la base de gestion des droits @@ -231,20 +218,6 @@ if (strlen($GACL_schema) > 0) { $bdd_gacl->exec("set search_path = " . $GACL_schema); } - /* - * Positionnement des messages dans la langue courante - */ - /* - switch ($LANG["date"]["locale"]) { - case "en": - $bdd_gacl->exec("set lc_messages to 'en_US.UTF-8'"); - break; - case "fr": - default: - $bdd_gacl->exec("set lc_messages to 'fr_FR.UTF-8'"); - break; - } - */ } else { $message->set(_("Echec de connexion à la base de données de gestion des droits (GACL)"),true); } diff --git a/framework/fonctions.php b/framework/fonctions.php index b78aeb26..39953168 100644 --- a/framework/fonctions.php +++ b/framework/fonctions.php @@ -153,7 +153,7 @@ function dataDelete($dataClass, $id, $isPartOfTransaction = false) } $message->setSyslog($e->getMessage()); if ($isPartOfTransaction) { - throw new Exception(sprintf("Suppression impossible de l'enregistrement %s"), $id); + throw new ObjetBDDException(sprintf("Suppression impossible de l'enregistrement %s"), $id); } $ret = -1; } @@ -459,7 +459,7 @@ function is_cli() if (defined('STDIN')) { return true; } - if (empty($_SERVER['REMOTE_ADDR']) and !isset($_SERVER['HTTP_USER_AGENT']) and count($_SERVER['argv']) > 0) { + if (empty($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['HTTP_USER_AGENT']) && count($_SERVER['argv']) > 0) { return true; } return false; @@ -485,11 +485,4 @@ function getLineFeed() function phpeol() { return getLineFeed(); - /* - if (PHP_SAPI == "cli") { - return PHP_EOL; - } else { - return "
"; - } - */ } diff --git a/framework/identification/identification.class.php b/framework/identification/identification.class.php index ac6a58e4..75e676fe 100644 --- a/framework/identification/identification.class.php +++ b/framework/identification/identification.class.php @@ -7,7 +7,8 @@ * Classe maîtrisant les aspects identification. */ class IdentificationException extends Exception -{ } +{ +} /** * @class Identification @@ -324,7 +325,7 @@ public function verifyLogin($loginEntered = "", $password = "", $modeAdmin = fal global $ident_header_vars; $headers = getHeaders($ident_header_vars["radical"]); $login = $headers[$ident_header_vars["login"]]; - if (strlen($login) > 0 && count($headers) > 0) { + if (strlen($login) > 0 && !empty($headers)) { /** * Verify if the login exists */ @@ -350,14 +351,14 @@ public function verifyLogin($loginEntered = "", $password = "", $modeAdmin = fal $createUser = true; if (count($ident_header_vars["organizationGranted"]) > 0 && !in_array($headers[$ident_header_vars["organization"]], $ident_header_vars["organizationGranted"])) { $createUser = false; - $log->setLog($login, "connexion", "HEADER-ko. The ".$headers[$ident_header_vars["organization"]]. " is not authorized to connect to this application"); + $log->setLog($login, "connexion", "HEADER-ko. The " . $headers[$ident_header_vars["organization"]] . " is not authorized to connect to this application"); } if ($createUser) { - $dlogin = array ( - "login"=>$login, - "nom"=>$headers[$ident_header_vars["cn"]], - "mail"=>$headers[$ident_header_vars["mail"]], - "actif"=>0 + $dlogin = array( + "login" => $login, + "nom" => $headers[$ident_header_vars["cn"]], + "mail" => $headers[$ident_header_vars["mail"]], + "actif" => 0 ); $login_id = $loginGestion->ecrire($dlogin); if ($login_id > 0) { @@ -371,16 +372,16 @@ public function verifyLogin($loginEntered = "", $password = "", $modeAdmin = fal * Send mail to administrators */ global $APPLI_nom, $APPLI_mail; - $subject = $APPLI_nom." "._("Nouvel utilisateur"); - $contents = "".sprintf(_("%1$s a créé son compte avec le login %2$s dans l'application %3$s. + $subject = $APPLI_nom . " " . _("Nouvel utilisateur"); + $contents = "" . sprintf(_("%1$s a créé son compte avec le login %2$s dans l'application %3$s.
Il est rattaché à l'organisation %5$s.
Le compte est inactif jusqu'à ce que vous l'activiez.
Pour activer le compte, connectez-vous à l'application %4$s -
Ne répondez pas à ce mail, qui est généré automatiquement")."",$login,$headers[$ident_header_vars["cn"]],$APPLI_nom, $APPLI_mail, $headers[$ident_header_vars["organization"]]); +
Ne répondez pas à ce mail, qui est généré automatiquement") . "", $login, $headers[$ident_header_vars["cn"]], $APPLI_nom, $APPLI_mail, $headers[$ident_header_vars["organization"]]); - $log->sendMailToAdmin($subject,$contents,"loginCreateByHeader",$login); - $message->set(_("Votre compte a été créé, mais est inactif. Un mail a été adressé aux administrateurs pour son activation") ); + $log->sendMailToAdmin($subject, $contents, "loginCreateByHeader", $login); + $message->set(_("Votre compte a été créé, mais est inactif. Un mail a été adressé aux administrateurs pour son activation")); } } } diff --git a/framework/identification/loginGestion.class.php b/framework/identification/loginGestion.class.php index 9a2a99e0..7e08b099 100644 --- a/framework/identification/loginGestion.class.php +++ b/framework/identification/loginGestion.class.php @@ -248,7 +248,7 @@ public function changePassword($oldpassword, $pass1, $pass2) if (isset($_SESSION["login"])) { $oldData = $this->lireByLogin($_SESSION["login"]); if ($log->getLastConnexionType($_SESSION["login"]) == "db") { - if ($this->_testPassword($_SESSION["login"], $oldpassword, $oldData["password"]) == true) { + if ($this->_testPassword($_SESSION["login"], $oldpassword, $oldData["password"])) { /* * Verifications de validite du mot de passe */ @@ -279,10 +279,8 @@ public function changePassword($oldpassword, $pass1, $pass2) public function changePasswordAfterLost($login, $pass1, $pass2) { $retour = 0; - if (strlen($login) > 0) { - if ($this->_passwordVerify($pass1, $pass2)) { - $retour = $this->writeNewPassword($login, $pass1); - } + if (strlen($login) > 0 && $this->_passwordVerify($pass1, $pass2)) { + $retour = $this->writeNewPassword($login, $pass1); } return $retour; } diff --git a/framework/identification/token.class.php b/framework/identification/token.class.php index 7f8bdc3a..d5de3de7 100644 --- a/framework/identification/token.class.php +++ b/framework/identification/token.class.php @@ -2,14 +2,15 @@ /** * Class for generate a identification token or read id - * + * * Token is crypted with private key of server, and decrypted with public key * Token is encoded in JSON format. It contain 2 fields : login and expire (timestamp) * @author quinton * */ class TokenException extends Exception -{ } +{ +} class Token { @@ -20,7 +21,7 @@ class Token /** * validityDuration : default duration validity of the token - * + * * @var int */ private $validityDuration = 86400; @@ -84,7 +85,7 @@ function createToken($login, $validityDuration = 0) "token" => base64_encode($crypted), "expire" => $expire, "timestamp" => $data["timestamp"], - "ip"=>$data["ip"] + "ip" => $data["ip"] ); $token = json_encode($dataToken); } else { @@ -178,7 +179,7 @@ private function getKey($type = "priv") $type == "priv" ? $filename = $this->privateKey : $filename = $this->pubKey; if (file_exists($filename)) { $handle = fopen($filename, "r"); - if ($handle != false) { + if ($handle) { $contents = fread($handle, filesize($filename)); if (!$contents) { throw new TokenException("key " . $filename . " is empty"); diff --git a/framework/log/log.class.php b/framework/log/log.class.php index 1f5f2c99..ee6d4db6 100644 --- a/framework/log/log.class.php +++ b/framework/log/log.class.php @@ -150,16 +150,15 @@ public function getLastConnections($duration = 36000) and nom_module like '%connexion' and commentaire like '%-ok' and commentaire <> 'token-ok' and log_date > :datefrom order by log_id desc"; - $date = new DateTime(now); + $date = new DateTime(); $date->sub(new DateInterval("PT" . $duration . "S")); - $data = $this->getListeParamAsPrepared( + return $this->getListeParamAsPrepared( $sql, array( "login" => $_SESSION["login"], "datefrom" => $date->format(DATELONGMASK), ) ); - return $data; } } diff --git a/framework/news.php b/framework/news.php index 424be56f..59e9048b 100644 --- a/framework/news.php +++ b/framework/news.php @@ -10,7 +10,7 @@ $doc = ""; $file = file($filename); foreach ($file as $value) { - if (substr($value, 1, 1) == "*" or substr($value, 0, 1) == "*") { + if (substr($value, 1, 1) == "*" || substr($value, 0, 1) == "*") { $doc .= "   "; } utf8_encode($value); @@ -19,4 +19,4 @@ $vue->set($doc, "texteNews"); $vue->set("framework/news.tpl", "corps"); -?> \ No newline at end of file +?> diff --git a/framework/objetbdd/ObjetBDD.php b/framework/objetbdd/ObjetBDD.php index bd30475b..bc92a496 100644 --- a/framework/objetbdd/ObjetBDD.php +++ b/framework/objetbdd/ObjetBDD.php @@ -521,7 +521,7 @@ function lire($id, $getDefault = true, $parentValue = 0) $sql = "select * from " . $this->table . " where " . $where; } $collection = $this->executeAsPrepared($sql, $data); - if (count($collection) == 0) { + if (empty($collection)) { if ($getDefault) { $collection = $this->getDefaultValue($parentValue); } else { @@ -801,7 +801,7 @@ function ecrire($dataBrute) } $sql = "select " . $cle . " from " . $this->table . " where " . $where; $rs = $this->executeAsPrepared($sql, $ds); - if (count($rs) == 0) { + if (empty($rs)) { /** * nouveau avec id passe */ @@ -948,7 +948,7 @@ function ecrire($dataBrute) } $rs = $this->executeAsPrepared($sql, $ds); if ($mode == "ajout" && $this->id_auto == 1) { - if ($this->typeDatabase == 'pgsql' && count($rs) > 0) { + if ($this->typeDatabase == 'pgsql' && !empty($rs)) { $ret = $rs[0][$this->cle]; } else { $last_id = $this->execute('SELECT LAST_INSERT_ID() as last_id'); @@ -1492,16 +1492,6 @@ private function htmlEncode($data) private function utf8Encode($data) { return $data; - /* - * if (is_array ( $data )) { - * foreach ( $data as $key => $value ) { - * $data [$key] = $this->utf8Encode ( $value ); - * } - * } else { - * $data = utf8_encode ( $data ); - * } - * return $data; - */ } /** @@ -1750,11 +1740,9 @@ function encodeData($data) /* * Traitement des chaines individuelles */ - if ($this->typeDatabase == 'pgsql') { - if ($this->UTF8) { - if (mb_detect_encoding($data) != "UTF-8") { - $data = mb_convert_encoding($data, 'UTF-8'); - } + if ($this->typeDatabase == 'pgsql' && $this->UTF8) { + if (mb_detect_encoding($data) != "UTF-8") { + $data = mb_convert_encoding($data, 'UTF-8'); } $data = pg_escape_string($data); } else { @@ -1929,11 +1917,10 @@ function getUUID() * @param bool $pathAbsolute: if false, the path of the class is $this->classpath/$classFile (default: false) * @return void */ - function classInstanciate( $className, $classFile, bool $pathAbsolute = false) + function classInstanciate($className, $classFile, bool $pathAbsolute = false) { - $pathAbsolute ? $path = $classFile : $path = $this->classpath."/".$classFile; - include_once $path; - $instance = new $className($this->connection, $this->paramori); - return $instance; + $pathAbsolute ? $path = $classFile : $path = $this->classpath . "/" . $classFile; + include_once $path; + return new $className($this->connection, $this->paramori); } } diff --git a/framework/objetbdd/ObjetBDD_functions.php b/framework/objetbdd/ObjetBDD_functions.php index dea825bb..aef7d872 100644 --- a/framework/objetbdd/ObjetBDD_functions.php +++ b/framework/objetbdd/ObjetBDD_functions.php @@ -28,7 +28,7 @@ function objetBDDparamInit() } else { $ObjetBDDParam["formatDate"] = $DEFAULT_formatdate; } - + $ObjetBDDParam["debug_mode"] = $OBJETBDD_debugmode; $_SESSION["ObjetBDDParam"] = $ObjetBDDParam; } @@ -37,7 +37,7 @@ function objetBDDparamInit() * function _new * initialisation d'une classe basee sur ObjetBDD, * avec passage des parametres adequats - * + * * @param * $classe * @return instance @@ -53,7 +53,7 @@ function _new($classe) * declaree precedemment avec la fonction _new. * Affiche les messages d'erreur le cas echeant * Retourne le resultat de la fonction d'ecriture. - * + * * @param * $instance * @param @@ -62,9 +62,7 @@ function _new($classe) */ function _ecrire($instance, $data) { - $rep = $instance->ecrire($data); - //$instance->getErrorData(1); - return $rep; + return $instance->ecrire($data); } -?> \ No newline at end of file +?> diff --git a/framework/utils/structure.php b/framework/utils/structure.php index e761df86..c2ea6e78 100644 --- a/framework/utils/structure.php +++ b/framework/utils/structure.php @@ -29,7 +29,6 @@ ) ); $vue->setParam(array("filename"=>"collec-dbstructure.tex")); - //$vue->htmlVars[] = "data"; break; case "gacl": $dataclass = new Structure($bdd_gacl, array(), $t_module["schemas"]); diff --git a/framework/version b/framework/version index 98027051..614fa8e0 100644 --- a/framework/version +++ b/framework/version @@ -1,2 +1,2 @@ -version_number=3.2.0 -version_date=2020-04-01 +version_number=3.3.0 +version_date=2021-09-23 diff --git a/modules/classes/import/export.class.php b/modules/classes/import/export.class.php index 2581b24d..de348afe 100644 --- a/modules/classes/import/export.class.php +++ b/modules/classes/import/export.class.php @@ -69,16 +69,16 @@ function getListPrimaryTables(): array function getTableContent(string $tableAlias, array $keys = array(), int $parentKey = 0): array { $model = $this->model[$tableAlias]; - if (count($model) == 0) { + if (empty($model)) { throw new ExportException(sprintf(_("L'alias %s n'a pas été décrit dans le modèle"), $tableAlias)); } $tableName = $model["tableName"]; $quote = '"'; $content = array(); $args = array(); - if (!$model["isEmpty"] || count($keys) > 0) { + if (!$model["isEmpty"] || !empty($keys)) { $sql = "select * from $quote$tableName$quote"; - if (count($keys) > 0) { + if (!empty($keys)) { $where = " where " . $quote . $model["technicalKey"] . $quote . " in ("; $comma = ""; foreach ($keys as $k) { @@ -211,7 +211,7 @@ function importDataTable(string $tableAlias, array $data, int $parentKey = 0, ar if ($model["istablenn"] == 1) { $tableAlias2 = $model["tablenn"]["tableAlias"]; $model2 = $this->model[$tableAlias2]; - if (count($model2) == 0) { + if (empty($model2)) { throw new ExportException(sprintf(_("Le modèle ne contient pas la description de la table %s"), $model["tablenn"]["tableAlias"])); } $tableName2 = $model2["tableName"]; @@ -271,7 +271,7 @@ function importDataTable(string $tableAlias, array $data, int $parentKey = 0, ar */ foreach ($row["parameters"] as $parameterName => $parameter) { $modelParam = $this->model[$parameterName]; - if (count($modelParam) == 0) { + if (empty($modelParam)) { throw new ExportException(sprintf(_("L'alias %s n'a pas été décrit dans le modèle"), $parameterName)); } /** @@ -320,7 +320,7 @@ function importDataTable(string $tableAlias, array $data, int $parentKey = 0, ar /** * Set values */ - if (count($setValues) > 0) { + if (!empty($setValues)) { foreach ($setValues as $kv => $dv) { if (strlen($dv) == 0) { throw new ExportException(sprintf(_("Une valeur vide a été trouvée pour l'attribut ajouté %s"), $kv)); @@ -340,7 +340,7 @@ function importDataTable(string $tableAlias, array $data, int $parentKey = 0, ar */ if ($id > 0) { foreach ($children as $tableChield => $child) { - if (count($child) > 0) { + if (!empty($child)) { if (!isset($child["isStrict"])) { $child["isStrict"] = false; } diff --git a/modules/classes/project.class.php b/modules/classes/project.class.php index 744be69b..2c76dc07 100644 --- a/modules/classes/project.class.php +++ b/modules/classes/project.class.php @@ -95,13 +95,13 @@ function getProjectsFromLogin() /** * Retourne la liste des projects correspondants aux groupes indiques * - * @param array $groups - * + * @param array $groups + * * @return array */ function getProjectsFromGroups(array $groups) { - if (count($groups) > 0) { + if (!empty($groups)) { /* * Preparation de la clause in */ diff --git a/modules/classes/tracking/detection.class.php b/modules/classes/tracking/detection.class.php index 01db2794..23e023a8 100644 --- a/modules/classes/tracking/detection.class.php +++ b/modules/classes/tracking/detection.class.php @@ -98,7 +98,7 @@ function importData(array $data, bool $rewriteMode = false) * Calculate the sunrise and the sunset */ $this->currentDate = substr($data["detection_date"], 10); - $this->sunset = date_sunset($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]);; + $this->sunset = date_sunset($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]); $this->sunrise = date_sunrise($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]); } if ($dateTimestamp >= $this->sunrise && $dateTimestamp <= $this->sunset) { @@ -195,7 +195,7 @@ function calculateGlobalSunPeriod(int $project_id, $formatDate = 'YYYY-MM-DD HH2 * Calculate the sunrise and the sunset */ $this->currentDate = substr($row["detection_date"], 10); - $this->sunset = date_sunset($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]);; + $this->sunset = date_sunset($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]); $this->sunrise = date_sunrise($dateTimestamp, SUNFUNCS_RET_TIMESTAMP, $this->dataAntenna["station_lat"], $this->dataAntenna["station_long"]); } if ($dateTimestamp >= $this->sunrise && $dateTimestamp <= $this->sunset) { diff --git a/modules/classes/tracking/individual_tracking.class.php b/modules/classes/tracking/individual_tracking.class.php index 8aafbb8c..23a8fab8 100644 --- a/modules/classes/tracking/individual_tracking.class.php +++ b/modules/classes/tracking/individual_tracking.class.php @@ -303,7 +303,6 @@ function getDetectionNumberByDate(int $individual_id, int $year = 0): ?array as (detection_date date, day int, night int, unknown int)"; $this->colonnes["detection_date"] = array("type" => 2); - $param = array("individual_id" => $individual_id); if ($year > 0) { $where .= " and extract(year from detection_date) = $year"; } diff --git a/modules/tracking/detection.php b/modules/tracking/detection.php index 12277a7d..a054acbe 100644 --- a/modules/tracking/detection.php +++ b/modules/tracking/detection.php @@ -37,9 +37,6 @@ include_once "modules/classes/tracking/antenna.class.php"; $antenna = new Antenna($bdd, $ObjetBDDParam); $vue->set($antenna->getListFromProject($dindividual["project_id"]), "antennas"); - include_once "modules/classes/tracking/location.class.php"; - //$location = new Location($bdd, $ObjetBDDParam); - //$vue->set($location->getListFromProject($dindividual["project_id"]), "locations"); break; case "write": /** diff --git a/modules/tracking/individualTracking.php b/modules/tracking/individualTracking.php index 23da59eb..1e5240e9 100644 --- a/modules/tracking/individualTracking.php +++ b/modules/tracking/individualTracking.php @@ -52,8 +52,6 @@ /** * Generate data for graphs */ - /*$axisx = array("x"); - $axisy = array("detection");*/ $axisx1 = array("x1"); $axisy1 = array("detection"); $stations = array(); @@ -61,8 +59,6 @@ $datemax = '1970-01-01 00:00:00'; $graphdata = array(); foreach ($dataStation as $row) { - /*$axisx[] = substr($row["date_from"],0, 19); - $axisy[] = $row["station_number"];*/ $date_from = substr($row["date_from"], 0, 19); $axisx1[] = $date_from; $axisy1[] = $row["station_number"]; @@ -111,8 +107,6 @@ $series[] = "detection"; $vue->set(json_encode($stations), "stations"); $vue->set(json_encode($regions), "regions"); - /*$chart = array($axisx, $axisy); - $vue->set(json_encode($chart), "chartData");*/ $chart2 = array($axisx1, $axisx2, $axisy1, $axisy2); $vue->set(json_encode($chart2), "chartData2"); usort($graphdata, function ($a, $b) { @@ -123,7 +117,6 @@ /** * Inhibits the encoding of chartData */ - //$vue->htmlVars[] = "chartData"; $vue->htmlVars[] = "stations"; $vue->htmlVars[] = "chartData2"; $vue->htmlVars[] = "graphdata"; diff --git a/modules/tracking/stationTracking.php b/modules/tracking/stationTracking.php index 95c6ab76..1061b86b 100644 --- a/modules/tracking/stationTracking.php +++ b/modules/tracking/stationTracking.php @@ -60,7 +60,6 @@ /** * Inhibits the encoding of chartData */ - //$vue->htmlVars[] = "chartData"; $vue->htmlVars[] = "graphStations"; $vue->htmlVars[] = "chartData"; $vue->htmlVars[] = "graphdata"; diff --git a/sonar-scanner.sh b/sonar-scanner.sh index ab7b41b3..1ae0336b 100755 --- a/sonar-scanner.sh +++ b/sonar-scanner.sh @@ -5,5 +5,6 @@ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.organization=equinton-github \ -Dsonar.login=4e5c6ec4233894236f4c7e85050c01924fa13453 \ - -Dsonar.exclusions=display/javascript/**,display/bower_components/**,vendor/**,database/**,install/**,param/**,plugins/phpqrcode/**,test/**,doc/**,img/**,temp/** + -Dsonar.exclusions=display/javascript/**,display/node_modules/**,vendor/**,database/**,install/**,param/**,plugins/**,test/**,doc/**,img/**,temp/** \ + -Dproject.settings=../sonar.properties