marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abgleich mit der aktuellen Version online. Ab und zu wurde am lebenden Objekt operiert

Browse Source
This commit is contained in:
marko
2021-06-12 14:27:24 +02:00
parent 7486a9e886
commit e56cd8cc7a
7 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "homepage/redesign2018/markdownExperiment/zopfli"]
path = homepage/redesign2018/markdownExperiment/zopfli
url = https://github.com/google/zopfli.git

2
homepage/redesign2018/markdownExperiment/zopfli

Submodule homepage/redesign2018/markdownExperiment/zopfli updated: ae43a8b738...6673e39fba

46
homepage/wkParticipo/achievements.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
// CREATE TABLE `cwsvjudo`.`achievements` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id/primary key' , `name` VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT 'name/caption of the Achivement' , `previousId` INT NOT NULL COMMENT 'id of the previous achievement' , `description` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'full descriptiopn in markdown' , PRIMARY KEY (`id`)) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT = 'eine Liste mit Achievements'; require_once('./local/db.php.inc');
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php');
require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.inc.php');
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/config/cwsvJudo.config.php");
require_once($basePath."/config/phpcount.config.php");
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
$dbConnection = getCwsvJudoDbConn();
try{
$results = dbQuery(
$dbConnection,
//"INSERT INTO `wkParticipo_user<=>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() . "<br/>queryString: ".$queryString."<br />"; 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);
?>
<html>
<body>
<?php echo( arrayKeyed2htmlTableString($results, ["id", "name", "rootId", "level", "description"], $withCaption = true) );?>
</body>
</html>

5
homepage/wkParticipo/addEvent.php
View File

@@ -12,12 +12,13 @@
$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error; $message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
} }
$query = sprintf( $query = sprintf(
"INSERT INTO wkParticipo_Events (wkId, meldefrist) "INSERT INTO wkParticipo_Events (wkId, datum, meldefrist)
SELECT * FROM (SELECT '%s', '%s') as new_event SELECT * FROM (SELECT '%s', '%s', '%s') as new_event
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s' SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s'
) LIMIT 1;", ) LIMIT 1;",
$mysqli->real_escape_string($_POST['f']['wkId']), $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']['meldefrist']),
$mysqli->real_escape_string($_POST['f']['wkId']) $mysqli->real_escape_string($_POST['f']['wkId'])
); );

5
homepage/wkParticipo/addFahrt.php
View File

@@ -1,5 +1,7 @@
<?php <?php
//var_dump($_POST); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
@@ -26,7 +28,6 @@
); );
$result = $mysqli->query($query); $result = $mysqli->query($query);
if(!$result){ if(!$result){
//echo "Fehler bei der Meldung: " . mysql_error(); die($query);
echo "Fehler bei der Meldung: "; die($query); echo "Fehler bei der Meldung: "; die($query);
} }
$message['success'] = $message['success'] =

5
homepage/wkParticipo/index.php
View File

@@ -47,6 +47,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
<nav class="navBar"> <nav class="navBar">
<ul> <ul>
<li><a href="/machs">Achievementsystem</a></li>
<li><a href="./infoZettel.php">Infozettel</a></li> <li><a href="./infoZettel.php">Infozettel</a></li>
<li> <li>
<a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a> <a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a>
@@ -249,8 +250,8 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
<p> <p>
Für offizielle, vom Verband ausgerichtete Wettkämpfe gibt es festgelegte Alters- und Gewichtsklassen: Für offizielle, vom Verband ausgerichtete Wettkämpfe gibt es festgelegte Alters- und Gewichtsklassen:
<ul> <ul>
<li><a href='http://cwsvjudo.bplaced.net/JudoWiki/AkGk/Jvs2019'>Alters- und Gewichtsklassen des Judoverbandes Sachsen</a></li> <li><a href='http://cwsvjudo.bplaced.net/JudoWiki/AkGk/Jvs2020'>Alters- und Gewichtsklassen des Judoverbandes Sachsen</a></li>
<li><a href='http://cwsvjudo.bplaced.net/JudoWiki/AkGk/Djb2019'>Alters- und Gewichtsklassen im Deutschen Judo Bundes</a></li> <li><a href='http://cwsvjudo.bplaced.net/JudoWiki/AkGk/Djb2020'>Alters- und Gewichtsklassen im Deutschen Judo Bundes</a></li>
</ul> </ul>
</p> </p>
<p><em>Achtung</em>: Bindend ist immer die Altersklasse auf der Ausschreibung. Ich kann mich beim Abschreiben ja auch mal vertan haben.</p> <p><em>Achtung</em>: Bindend ist immer die Altersklasse auf der Ausschreibung. Ich kann mich beim Abschreiben ja auch mal vertan haben.</p>

8
homepage/wkParticipo/login.php
View File

@@ -1,8 +1,12 @@
<?php <?php
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
// require_once('./auth.php');
require_once('./lib/wkParticipoLib.inc.php'); require_once('./lib/wkParticipoLib.inc.php');
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/config/phpcount.config.php");
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
if (isset($_SESSION['login'])) { if (isset($_SESSION['login'])) {
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php'); header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php');
} else { } else {
@@ -37,7 +41,7 @@ if (isset($_SESSION['login'])) {
), ),
); );
$message['success'] = 'Anmeldung erfolgreich, <a href="index.php">weiter zum Inhalt.'; $message['success'] = 'Anmeldung erfolgreich, <a href="index.php">weiter zum Inhalt.';
// PHPCount::AddHit("wkParticipo-Login ".$_POST['f']['username']); PHPCount::AddHit("wkParticipo-Login ".$_POST['f']['username']);
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/pages/desktop/wkParticipo/index.php?user=' . $_POST['f']['username']); header('Location: http://' . $_SERVER['HTTP_HOST'] . '/pages/desktop/wkParticipo/index.php?user=' . $_POST['f']['username']);
} else { } else {
sleep(1); sleep(1);