From 0c4334990ee786678f369ef803c6db09305cc6b9 Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 20 Dec 2021 19:10:55 +0100 Subject: [PATCH] some bugfixes machs --- homepage/config/.htaccess | 3 +++ homepage/config/cwsvJudo.config.php | 6 ++++++ homepage/config/phpcount.config.php | 10 +++++++++ homepage/machs/index.php | 28 ++++++++++---------------- homepage/machs/lib/achievementsLib.php | 12 ++++++++--- homepage/machs/lib/db.php | 1 + homepage/machs/lib/record.php | 9 +++++---- homepage/machs/records.php | 3 --- homepage/machs/setUserData.php | 7 +------ 9 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 homepage/config/.htaccess create mode 100644 homepage/config/cwsvJudo.config.php create mode 100644 homepage/config/phpcount.config.php diff --git a/homepage/config/.htaccess b/homepage/config/.htaccess new file mode 100644 index 0000000..2a42bfb --- /dev/null +++ b/homepage/config/.htaccess @@ -0,0 +1,3 @@ +order deny,allow +deny from all +allow from localhost diff --git a/homepage/config/cwsvJudo.config.php b/homepage/config/cwsvJudo.config.php new file mode 100644 index 0000000..2cee126 --- /dev/null +++ b/homepage/config/cwsvJudo.config.php @@ -0,0 +1,6 @@ + diff --git a/homepage/config/phpcount.config.php b/homepage/config/phpcount.config.php new file mode 100644 index 0000000..35ce128 --- /dev/null +++ b/homepage/config/phpcount.config.php @@ -0,0 +1,10 @@ + diff --git a/homepage/machs/index.php b/homepage/machs/index.php index 23ada8c..d088723 100644 --- a/homepage/machs/index.php +++ b/homepage/machs/index.php @@ -8,30 +8,22 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); require_once("./lib/db.php"); require_once("./lib/achievementsLib.php"); require_once("./lib/api.php"); - -$dbConnection = getPdoDbConnection( - $cwsvJudoConfig["db"]["host"], - $cwsvJudoConfig["db"]["name"], - $cwsvJudoConfig["db"]["user"], - $cwsvJudoConfig["db"]["password"] -); - require_once("./auth.php"); + require_once("./lib/machs/achievementGroup.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(); $dbConnection = getPdoDbConnection( $cwsvJudoConfig["db"]["host"], $cwsvJudoConfig["db"]["name"], $cwsvJudoConfig["db"]["user"], $cwsvJudoConfig["db"]["password"] ); + require_once("./auth.php"); -$achievementGroups = getAchievementGroups($dbConnection); + achievementGroup::setDbConnection($dbConnection); + $achievementGroups = achievementGroup::getAllAchievementGroups(); processPostData($dbConnection, $_POST); @@ -58,12 +50,12 @@ processPostData($dbConnection, $_POST); - + Eigene Achievements" ); - echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) ); + // echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) ); echo(htmlAchievementListForUser( $dbConnection, $achievementGroups, @@ -78,7 +70,7 @@ processPostData($dbConnection, $_POST); foreach($usersKids as $k){ if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) and ($k['kidId']!=$_SESSION['user']['userId']) ){ echo( "

".$k['vorname']." ".$k['name']."

" ); - echo( htmlUsersUploadBox($dbConnection, $k['kidId']) ); + // echo( htmlUsersUploadBox($dbConnection, $k['kidId']) ); echo(htmlAchievementListForUser( $dbConnection, $achievementGroups, @@ -100,9 +92,11 @@ processPostData($dbConnection, $_POST); echo( htmlUpdateAchievementBox( $a['id'], $a['name'], - $a['description'], $a['rootId'], - $a['level'] + $a['achievementGroupId'], + $a['level'], + $a['description'], + $a['imgUrl'] )); echo("
"); } diff --git a/homepage/machs/lib/achievementsLib.php b/homepage/machs/lib/achievementsLib.php index 10b50e9..3e2a86c 100644 --- a/homepage/machs/lib/achievementsLib.php +++ b/homepage/machs/lib/achievementsLib.php @@ -141,7 +141,7 @@ return $html; } function htmlAchievementListForUser($db, $achievementGroups, $userId, $usersAchievmentIds, $noForm=false){ -//var_dump($db, $achievementGroups, $userId, $usersAchievmentIds); +// var_dump($db, $achievementGroups, $userId, $usersAchievmentIds); $ids=[]; foreach($usersAchievmentIds as $a){ $ids[]=$a['achievementId']; @@ -154,12 +154,16 @@ $retHtml = ""; } $retHtml .= "
"; foreach($achievementGroups as $g){ - $records = record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum'])); + $records = ( + ($userData[0]['gebDatum']!=null)? + (record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum']))): + [] + ); $retHtml .= "
"; $retHtml .= "
    "; // see, if there is a record for this group $imgUrl = null; - foreach($g->achievements as $a){ + foreach($g->getAchievements() as $a){ if($a['imgUrl'] != null){ $imgUrl = $a['imgUrl']; } @@ -256,6 +260,8 @@ $html = ""; $html .= ""; $html .= ""; $html .= ""; + $html .= ""; + $html .= ""; $html .= ""; $html .= ""; return $html; diff --git a/homepage/machs/lib/db.php b/homepage/machs/lib/db.php index fa4d04c..9a1717e 100644 --- a/homepage/machs/lib/db.php +++ b/homepage/machs/lib/db.php @@ -10,6 +10,7 @@ function getPdoDbConnection($hostname, $dbName, $user, $password){ } catch(PDOException $dbError){ echo( "Error whilst getting a dbConnection!: " . $dbError->getMessage() ); + var_dump($hostname, $dbName, $user, $password); } return $dbConnection; } diff --git a/homepage/machs/lib/record.php b/homepage/machs/lib/record.php index 6cb5dbe..df1b1ac 100644 --- a/homepage/machs/lib/record.php +++ b/homepage/machs/lib/record.php @@ -100,8 +100,9 @@ SQL; $retHtml.= "Die Rekorde der jüngeren gelten auch für die älteren, aber nicht umgekehrt. "; $retHtml.= "Damit ein Rekord auch eingetragen wird, muss er mit einem Nachweis in Videoform gemeldet werden."; $retHtml.= "

    Rekord melden

    "; - $retHtml.= "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:"; - $retHtml.= htmlUsersUploadBox(self::$db, $u['id']); + $retHtml.= "Um einen Rekord zu melden, schickt als Nachweis ein Video des Rekordes hoch an cwsvJudo@arcor.de."; + // $retHtml.= "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:"; + // $retHtml.= htmlUsersUploadBox(self::$db, $u['id']); $retHtml.= "Anschließend kannst Du den Rekord melden:"; $retHtml.= "
    "; if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){ @@ -121,12 +122,12 @@ SQL; $retHtml.= ""; } $retHtml.= "
    "; + $retHtml.= "

    Sobald das Nachweisvideo gesichtet ist und es eine neue Bestleistung darstellt, wird der Rekord dann eingetragen und damit offiziell.

    "; $retHtml.= "
"; $retHtml.= "
"; $retHtml.= "Zurück"; $retHtml.= "
"; $retHtml.= "
"; -// $retHtml.= ""; return $retHtml; } @@ -160,7 +161,7 @@ COLLAPSIBLE; $group->loadAchievementGroupFromDb($gid); $retHtml.= ""; - var_dump($group->canHaveRecords()); + // var_dump($group->canHaveRecords()); if($group->canHaveRecords()){ $retHtml = "<".$frameTag." class=\"card\">"; $retHtml.= "
"; diff --git a/homepage/machs/records.php b/homepage/machs/records.php index f25e162..b005f2c 100644 --- a/homepage/machs/records.php +++ b/homepage/machs/records.php @@ -17,10 +17,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); require_once($basePath."/config/cwsvJudo.config.php"); require_once($basePath."/config/phpcount.config.php"); require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php"); - PHPCount::AddHit("Achievementsystem (".htmlspecialchars($_SESSION['user']['username']).")"); -// require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php"); -// $dbConnection = getCwsvJudoDbConn(); $dbConnection = getPdoDbConnection( $cwsvJudoConfig["db"]["host"], $cwsvJudoConfig["db"]["name"], diff --git a/homepage/machs/setUserData.php b/homepage/machs/setUserData.php index 5ac43cd..3bbc4d5 100644 --- a/homepage/machs/setUserData.php +++ b/homepage/machs/setUserData.php @@ -15,12 +15,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); $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"); - PHPCount::AddHit("Achievementsystem setUserData(".htmlspecialchars($_SESSION['user']['username']).")"); -// require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php"); -// $dbConnection = getCwsvJudoDbConn(); $dbConnection = getPdoDbConnection( $cwsvJudoConfig["db"]["host"], $cwsvJudoConfig["db"]["name"], @@ -66,7 +61,7 @@ processPostData($dbConnection, $_POST); foreach($usersKids as $k){ if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) ){ echo( "

".$k['vorname']." ".$k['name']."

" ); - echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) ); + // echo( htmlUsersUploadBox($dbConnection, $k['kidId']) ); echo( setUserDataBox($k['kidId']) ); } }