From e56cd8cc7aea393abb581af1849ba38a8664c335 Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 12 Jun 2021 14:27:24 +0200 Subject: [PATCH] Abgleich mit der aktuellen Version online. Ab und zu wurde am lebenden Objekt operiert --- .gitmodules | 3 ++ .../redesign2018/markdownExperiment/zopfli | 2 +- homepage/wkParticipo/achievements.php | 46 +++++++++++++++++++ homepage/wkParticipo/addEvent.php | 5 +- homepage/wkParticipo/addFahrt.php | 5 +- homepage/wkParticipo/index.php | 5 +- homepage/wkParticipo/login.php | 8 +++- 7 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 .gitmodules create mode 100644 homepage/wkParticipo/achievements.php diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..246dd5a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "homepage/redesign2018/markdownExperiment/zopfli"] + path = homepage/redesign2018/markdownExperiment/zopfli + url = https://github.com/google/zopfli.git diff --git a/homepage/redesign2018/markdownExperiment/zopfli b/homepage/redesign2018/markdownExperiment/zopfli index ae43a8b..6673e39 160000 --- a/homepage/redesign2018/markdownExperiment/zopfli +++ b/homepage/redesign2018/markdownExperiment/zopfli @@ -1 +1 @@ -Subproject commit ae43a8b73827577c4b19b005b6eed81f5cf9bbac +Subproject commit 6673e39fba6122c948c9ec34f07166812d473eb6 diff --git a/homepage/wkParticipo/achievements.php b/homepage/wkParticipo/achievements.php new file mode 100644 index 0000000..6cb9a87 --- /dev/null +++ b/homepage/wkParticipo/achievements.php @@ -0,0 +1,46 @@ +userAttributes` (userId, attributeId) VALUES (:userId, :attributeId);", + "SELECT * FROM cwsvjudo.achievements;" + //array( + // ':userId' => array('value'=>$anUserId, 'data_type'=>PDO::PARAM_INT), + // ':attributeId'=> array('value'=>$anAttributeId, 'data_type'=>PDO::PARAM_INT) + //) + ); + } + catch(PDOException $db_error){ + print "Error!: " . $db_error->getMessage() . "
queryString: ".$queryString."
"; var_dump($bindArray); + } + + +// $query = "WITH SortedList (id, previousId, name, Level) AS ( SELECT Id, ParentId, SomeData, 0 as Level FROM cwsvjudo.achievements WHERE `id` IS 1 UNION ALL SELECT ll.id, ll.previousId, ll.name, Level+1 as Level FROM cwsvjudo.achievements ll INNER JOIN SortedList as s ON ll.previousId = s.Id ); SELECT id, previousId, name FROM SortedList ORDER BY Level "; +// $query = "SELECT (id, name, rootId, level) FROM cwsvjudo.achievements WHERE `id` = 1 ORDER BY `level`;"; +// $query = "SELECT * FROM cwsvjudo.achievements;"; +// $results = $mysqlConn->query($query); + +// var_dump($results); +?> + + + + + + diff --git a/homepage/wkParticipo/addEvent.php b/homepage/wkParticipo/addEvent.php index 275f9cd..9d05fed 100644 --- a/homepage/wkParticipo/addEvent.php +++ b/homepage/wkParticipo/addEvent.php @@ -12,12 +12,13 @@ $message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error; } $query = sprintf( - "INSERT INTO wkParticipo_Events (wkId, meldefrist) - SELECT * FROM (SELECT '%s', '%s') as new_event + "INSERT INTO wkParticipo_Events (wkId, datum, meldefrist) + SELECT * FROM (SELECT '%s', '%s', '%s') as new_event WHERE NOT EXISTS ( SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s' ) LIMIT 1;", $mysqli->real_escape_string($_POST['f']['wkId']), + $mysqli->real_escape_string($_POST['f']['datum']), $mysqli->real_escape_string($_POST['f']['meldefrist']), $mysqli->real_escape_string($_POST['f']['wkId']) ); diff --git a/homepage/wkParticipo/addFahrt.php b/homepage/wkParticipo/addFahrt.php index 81d25c8..7888b56 100644 --- a/homepage/wkParticipo/addFahrt.php +++ b/homepage/wkParticipo/addFahrt.php @@ -1,5 +1,7 @@ query($query); if(!$result){ - //echo "Fehler bei der Meldung: " . mysql_error(); die($query); echo "Fehler bei der Meldung: "; die($query); } $message['success'] = diff --git a/homepage/wkParticipo/index.php b/homepage/wkParticipo/index.php index bc81a01..c6cbff8 100644 --- a/homepage/wkParticipo/index.php +++ b/homepage/wkParticipo/index.php @@ -47,6 +47,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');