CCCHH/sunders
3
0
Fork 1
forked from kamba4/sunders
Code Issues 4 Pull requests Packages 1 Activity Actions

refactor: Replaces PASSWD with PASSWORD

Browse source
This commit is contained in:
Vincent Mahnke 2025-10-11 21:48:07 +02:00 • committed by Vincent Mahnke
commit 41b5ea2ab1
10 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containerfile.data_init
View file

@ -5,7 +5,7 @@ COPY ./data_init/*.sql /var/sunders/init.sql
CMD mariadb --host="$MYSQL_HOST" \ CMD mariadb --host="$MYSQL_HOST" \
--user="$CAMERA_USER" \ --user="$CAMERA_USER" \
--password="$CAMERA_USER_PASSWD" \ --password="$CAMERA_USER_PASSWORD" \
--skip-ssl \ --skip-ssl \
${MYSQL_DB:+--database="$MYSQL_DB"} \ ${MYSQL_DB:+--database="$MYSQL_DB"} \
< "/var/sunders/init.sql" < "/var/sunders/init.sql"

2
home/sunders/update_cameras/update_camera.php
View file

@ -15,7 +15,7 @@ $id = 0;
$latitude = 0; $latitude = 0;
$longitude = 0; $longitude = 0;
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if($mysqli->connect_errno) { if($mysqli->connect_errno) {
echo "Error while connecting to DB : $mysqli->error \n" ; echo "Error while connecting to DB : $mysqli->error \n" ;

2
home/sunders/update_cameras/update_statistics.php
View file

@ -4,7 +4,7 @@ include "config.php";
if (USE_STATISTICS) { if (USE_STATISTICS) {
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if ($mysqli->connect_errno) { if ($mysqli->connect_errno) {
echo "Error while connecting to DB : ".$mysqli->error." \n" ; echo "Error while connecting to DB : ".$mysqli->error." \n" ;

2
utils/config.php
View file

@ -5,7 +5,7 @@ define('REPLICATE_URL', 'https://planet.openstreetmap.org/replication/minute');
define('MYSQL_HOST', getenv('MYSQL_HOST')); define('MYSQL_HOST', getenv('MYSQL_HOST'));
define('MYSQL_DB', getenv('MYSQL_DB')); define('MYSQL_DB', getenv('MYSQL_DB'));
define('MYSQL_USER', getenv('MYSQL_USER')); define('MYSQL_USER', getenv('MYSQL_USER'));
define('MYSQL_PASSWD', getenv('MYSQL_PASSWD')); define('MYSQL_PASSWORD', getenv('MYSQL_PASSWORD'));
define('USE_STATISTICS', false); define('USE_STATISTICS', false);
define('WEBSERVICE_COUNTRY_URL', 'http://api.geonames.org/countryCode'); define('WEBSERVICE_COUNTRY_URL', 'http://api.geonames.org/countryCode');

2
utils/get_sync_state.php
View file

@ -2,7 +2,7 @@
include "config.php"; include "config.php";
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if($mysqli->connect_errno) { if($mysqli->connect_errno) {
echo "Error while connecting to DB : $mysqli->error \n" ; echo "Error while connecting to DB : $mysqli->error \n" ;

6
utils/init_db.php
View file

@ -2,15 +2,15 @@
// Admin credentials (must have privileges to create DB/users) // Admin credentials (must have privileges to create DB/users)
$dbHost = getenv('MYSQL_HOST'); $dbHost = getenv('MYSQL_HOST');
$dbAdmin = getenv('MYSQL_USER'); $dbAdmin = getenv('MYSQL_USER');
$dbPassword = getenv('MYSQL_PASSWD'); $dbPassword = getenv('MYSQL_PASSWORD');
$dbName = getenv('MYSQL_DB'); $dbName = getenv('MYSQL_DB');
// Variables for new users // Variables for new users
$cameraUser = getenv('CAMERA_USER'); $cameraUser = getenv('CAMERA_USER');
$cameraPassword = getenv('CAMERA_USER_PASSWD'); $cameraPassword = getenv('CAMERA_USER_PASSWORD');
$camSelectUser = getenv('CAMERA_SELECT_USER'); $camSelectUser = getenv('CAMERA_SELECT_USER');
$camSelectPassword = getenv('CAMERA_SELECT_USER_PASSWD'); $camSelectPassword = getenv('CAMERA_SELECT_USER_PASSWORD');
// Connect to MySQL // Connect to MySQL
$conn = new mysqli($dbHost, $dbAdmin, $dbPassword); $conn = new mysqli($dbHost, $dbAdmin, $dbPassword);

2
utils/update_camera.php
View file

@ -15,7 +15,7 @@ $id = 0;
$latitude = 0; $latitude = 0;
$longitude = 0; $longitude = 0;
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if($mysqli->connect_errno) { if($mysqli->connect_errno) {
echo "Error while connecting to DB : $mysqli->error \n" ; echo "Error while connecting to DB : $mysqli->error \n" ;

2
www/sunders/camera.php
View file

@ -266,7 +266,7 @@
$divDiag2 = ($divWidth * $divWidth) + ($divHeight * $divHeight); $divDiag2 = ($divWidth * $divWidth) + ($divHeight * $divHeight);
/* Connect to database */ /* Connect to database */
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if($mysqli->connect_errno) { if($mysqli->connect_errno) {
header('Content-type: application/json'); header('Content-type: application/json');
$result = '{"error":"error while connecting to db : ' . $mysqli->error . '"}'; $result = '{"error":"error while connecting to db : ' . $mysqli->error . '"}';

28
www/sunders/config.php
View file

@ -1,19 +1,15 @@
<?php <?php
define('DEFAULT_ZOOM', getenv('DEFAULT_ZOOM') ?: 11);
define('DEFAULT_LAT', getenv('DEFAULT_LAT') ?: 53.5550);
define('DEFAULT_LON', getenv('DEFAULT_LON') ?: 10.0099);
define('DEFAULT_LANGUAGE', getenv('DEFAULT_LANGUAGE') ?: 'en');
define('DEFAULT_PIE', 'country');
define('DEFAULT_TIME', 'single');
define('DEFAULT_ZOOM', 15); define('MYSQL_HOST', getenv('MYSQL_HOST') ?: '');
define('DEFAULT_LAT', 52.37672572); define('MYSQL_DB', getenv('MYSQL_DB') ?: '');
define('DEFAULT_LON', 9.73787785); define('MYSQL_USER', getenv('MYSQL_USER') ?: '');
define('DEFAULT_LANGUAGE', 'en'); define('MYSQL_PASSWORD', getenv('MYSQL_PASSWORD') ?: '');
define('DEFAULT_PIE', 'country');
define('DEFAULT_TIME', 'single');
define('MYSQL_HOST', getenv('MYSQL_HOST')); define('USE_STATISTICS', false);
define('MYSQL_DB', getenv('MYSQL_DB')); ?>
define('MYSQL_USER', getenv('MYSQL_USER'));
define('MYSQL_PASSWD', getenv('MYSQL_PASSWD'));
define('USE_STATISTICS', false);
?>

2
www/sunders/stats/index.php
View file

@ -138,7 +138,7 @@
$statsQueryObject = $levelObject->{$statsKey}; $statsQueryObject = $levelObject->{$statsKey};
/* Connect to database */ /* Connect to database */
$mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWD, MYSQL_DB); $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB);
if($mysqli->connect_errno) { if($mysqli->connect_errno) {
echo 'Error while connecting to DB : $mysqli->error \n' ; echo 'Error while connecting to DB : $mysqli->error \n' ;
exit(1); exit(1);