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

register starts is now possible in the new materialize version

Browse Source
This commit is contained in:
marko
2023-01-15 18:45:33 +01:00
parent 6d5d7e7142
commit 90d84283e8
13 changed files with 1201 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
homepage/participo/api.starter.add.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
require_once 'config/participo.php';
require_once './local/cwsvJudo.php';
require_once 'participoLib/dbConnector.php';
require_once 'participoLib/participo.php';
require_once 'participoLib/planer.php';
dbConnector::connect(
$cwsvJudoConfig['db']['host'],
$cwsvJudoConfig['db']['name'],
$cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password']
);
participo::authentificate();
$eventId = $_POST['eventId'] ?? null;
$startingTypeId = $_POST['type'] ?? null;
$starterId = $_POST['userId'] ?? null;
$returnToUrl = $_POST['returnToUrl'] ?? 'participo/';
// @todo Check against deadline?
$newStarter = new Starter(null, $eventId, $startingTypeId, $starterId);
$newStarterId = $newStarter->addToDb();
header('Location: ' . urldecode($returnToUrl), true, 301);
exit(-1); // shouldn't matter

28
homepage/participo/api.starter.remove.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
require_once 'config/participo.php';
require_once './local/cwsvJudo.php';
require_once 'participoLib/dbConnector.php';
require_once 'participoLib/participo.php';
require_once 'participoLib/planer.php';
dbConnector::connect(
$cwsvJudoConfig['db']['host'],
$cwsvJudoConfig['db']['name'],
$cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password']
);
participo::authentificate();
$eventId = $_POST['eventId'] ?? null;
$starterId = $_POST['userId'] ?? null;
$returnToUrl = $_POST['returnToUrl'] ?? 'participo/';
$starter = new Starter(null, $eventId, null, $starterId);
$starter->removeFromDb();
header('Location: ' . urldecode($returnToUrl), true, 301);
exit(-1); // shouldn't matter

35
homepage/participo/apiKeyTest.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
require_once 'config/participo.php';
require_once './local/cwsvJudo.php';
require_once 'participoLib/participo.php';
require_once 'participoLib/apiKey.php';
require_once 'spyc/Spyc.php';
dbConnector::connect(
$cwsvJudoConfig['db']['host'],
$cwsvJudoConfig['db']['name'],
$cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password']
);
$userId = 1;
$apiKey = ApiKey::create();
$rightString = 'event:' . PHP_EOL . ' id: 1';
$rightArray = Spyc::YAMLLoadString($rightString);
$date = new DateTime();
$newKey = new ApiKey(null, $userId, $apiKey, $rightString, $date->format('Y-m-d'));
$newKey->addToDb();
$loadedKey = ApiKey::loadFromDb($apiKey);
?>
<!doctype html>
<html>
<body>
<ul>
<li>rightsRoundabout: <?echo( $loadedKey->isValidFor($rightArray) ? 'TRUE' : 'FALSE' );?></li>
</ul>
</body>
<html>

44
homepage/participo/events.js Normal file
View File

@@ -0,0 +1,44 @@
function initSelects() {
var selectElements = document.querySelectorAll('select');
var selectInstances = M.FormSelect.init(selectElements, {});
}
function initSidenav() {
var sidenavElements = document.querySelectorAll('.sidenav');
var sidenavInstances = M.Sidenav.init(sidenavElements, {});
};
function initModals() {
var modalElements = document.querySelectorAll('.modal');
var modalInstances = M.Modal.init(modalElements, {
'onOpenEnd': initSelects
});
};
function openEventModal(eventId) {
openModal(`#event-modal-${eventId}`);
}
function openModal(modalId) {
var modalElement = document.querySelector(modalId);
if (modalElement === null) {
return;
}
var modalInstance = M.Modal.getInstance(modalElement);
modalInstance.open();
}
// What to do when the document is loaded.
document.addEventListener('DOMContentLoaded', function () {
// init materialize elements
initModals();
initSidenav();
initSelects();
// opening event modal if given
var eventId = parseInt(window.location.hash.substring(1));
if (!isNaN(eventId)) {
openEventModal(eventId);
}
});

22
homepage/participo/lib/participoLib/dbConnector.php
View File

@@ -45,6 +45,7 @@ class dbConnector
/// als UTF8 in latin1(?) gespeichert. /// als UTF8 in latin1(?) gespeichert.
/// @toDo: Die Standardwerte sollten vielleicht aus einer config /// @toDo: Die Standardwerte sollten vielleicht aus einer config
/// kommen, nicht hardcoded /// kommen, nicht hardcoded
try { try {
$pdoStatement = self::$db->prepare($aQueryString); $pdoStatement = self::$db->prepare($aQueryString);
foreach ($aBindArray as $bindName => $bind) { foreach ($aBindArray as $bindName => $bind) {
@@ -92,6 +93,12 @@ class dbConnector
return $ret; return $ret;
} }
// @todo docu
public static function getLastInsertId()
{
return self::$db->lastInsertId();
}
// get a Connection to the database // get a Connection to the database
private static function connectToPdo($hostname, $dbName, $user, $password) private static function connectToPdo($hostname, $dbName, $user, $password)
{ {
@@ -120,4 +127,19 @@ class dbConnector
self::$db = null; self::$db = null;
} }
} }
public static function debugEchoQuery($query, $params)
{
foreach ($params as $key => $value) {
switch($value['data_type']) {
case PDO::PARAM_STR:{
$query = str_replace($key, '\'' . $value['value'] . '\'', $query);
}
default:{
$query = str_replace($key, $value['value'], $query);
}
}
};
echo('query: ' . $query . PHP_EOL);
}
} }

209
homepage/participo/lib/participoLib/event.php Normal file
View File

@@ -0,0 +1,209 @@
<?php
/** Framework for a event
*/
class Event
{
private $id = null; //< unique id of the event in the db
private $date = null; //< date for the event (@todo ranges?)
private $shiaiId = null; //< unique id of the shiai in the db (if appropriate)
private $deadline = null; //< until when one can register for the event
private $remarks = null; //< remarks to the event (special rules) or a json object for missing data (e.g. non-shiai events)
private $shiai = null; //< a place to load the linked shiai to (if loaded)
/** constructor
*
* @param int $id id in the database
* @param string $date date of the event as string in the format "YYYY-MM-DD"
* @param int $shiaiId id of the linked shiai or null if not appropriate
* @param string $deadline deadline for sign ins in the format "YYYY-MM-DD"
* @param string $remarks (json formatted) string with meta information
* @param Shiai $shiai if the shiai is loaded anyway it can be placed here.
*/
public function __construct($id, $date, $shiaiId, $deadline, $remarks, $shiai)
{
//! @todo InputValidation
$this->id = (int) $id;
$this->date = DateTime::createFromFormat('Y-m-d', $date);
$this->shiaiId = (($shiaiId != null) ? ((int)$shiaiId) : (null));
$this->deadline = DateTime::createFromFormat('Y-m-d', $deadline);
$this->remarks = $remarks;
$this->shiai = $shiai;
}
public static function loadFromDb(int $id)
{
$query = 'SELECT * FROM `cwsvjudo`.`wkParticipo_Events` WHERE `id` = :id;';
$params = [':id' => ['value' => $id, 'data_type' => PDO::PARAM_INT]];
$response = dbConnector::query($query, $params);
// ids are considered unique. so every other count then 1 is treated as error to prevent unprivileged access
if (count($response) != 1) {
return null;
}
return Event::fromDbArray($response[0]);
}
/** Representation of an event as (materializeCss) card
*
* @return string string with the html code of the event
*/
public function asHtmlCard()
{
return
'<div class="card blue-grey darken-1">' .
'<div class="card-content white-text">' .
'<span class="card-title">' . $this->shiai->getHtmlName() . '</span>' .
'<dl>' .
'<dt>Datum</dt>' .
'<dd>' . $this->date->format('Y-m-d') . '</dd>' .
'<dt>Meldefrist</dt>' .
'<dd>' . $this->deadline->format('Y-m-d') . '</dd>' .
'<dt>Altersklassen</dt>' .
'<dd>' . $this->shiai->getAgeClasses() . '</dd>' .
'</div>' .
'</div>';
}
public function htmlTableRow()
{
return
'<tr>' .
'<td>' . $this->date->format('Y-m-d') . '</td>' .
'<td><a href="/pages/desktop/wkParticipo/showWkEvent.php?eventId=' . $this->id . '" >' . $this->shiai->getHtmlName() . '</a></td>' .
'<td>' . $this->shiai->getAgeClasses() . '</td>' .
'<td><a class="waves-effect waves-light btn modal-trigger" href="#event-modal-' . $this->id . '"><i class="material-icons">zoom_in</i></a></td>' .
'</tr>';
}
public function htmlModal()
{
$modal =
'<div id="event-modal-' . $this->id . '" class="modal black-text">'
. '<div class="modal-content">'
. $this->shiai->getHtml()
. $this->getHtmlStarterList();
$kids = participo::getKids();
$modal .= '<div class="row">';
foreach ($kids as $k) {
$modal .= $this->getHtmlAddStarterForm($k);
}
$modal .= '</div>';
$modal .=
'</div>' . // end modal-content
'<div class="modal-footer">' .
'<a href="/pages/desktop/wkParticipo/showWkEvent.php?eventId=' . $this->id . '" class="modal-close waves-effect waves-green btn-flat">Zum Event im Planer</a>' .
'<a href="#!" class="modal-close waves-effect waves-green btn-flat">Schließen</a>' .
'</div>' . // end modal-footer
'</div>';
echo($modal);
}
public function getHtmlStarterList()
{
$listOfStarter = $this->getStarter();
if (!isset($listOfStarter) || count($listOfStarter) == 0) {
return '';
}
$starterList .= 'Bereits eingetragen: <div class="row">';
foreach ($listOfStarter as $s) {
$u = $s->getUser();
$starterList .= '<div class="col s6 m3">' . $u->getName() . ', ' . $u->getFirstname() . $this->getHtmlRemoveStarterForm($s->getEventId(), $s->getUserId()) . '</div>';
}
$starterList .= '</div>';
return $starterList;
}
/** Returns the currents users starter to this event
*
* @todo docu
*/
private function getStarter()
{
$userId = $_SESSION['user']['userId'] ?? null;
$query = 'SELECT `wkParticipo_Starter`.`id` as `starterId` FROM `wkParticipo_Starter` '
. 'LEFT JOIN `vormundschaft` ON `vormundschaft`.`kidId` = `wkParticipo_Starter`.`userId` '
. ' WHERE `wkParticipo_Starter`.`eventId` = :eventId AND `vormundschaft`.`userId` = :userId;';
$params = [
':eventId' => ['value' => $this->id, 'data_type' => PDO::PARAM_INT],
':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]
];
$response = dbConnector::query($query, $params);
$starter = [];
foreach ($response as $r) {
$starter[] = Starter::loadFromDb($r['starterId']);
}
return $starter;
}
public static function fromArray($member)
{
$shiai = json_decode($member['bemerkungen'], true);
return new event(
$member['id'] ?? null,
$member['date'] ?? null,
$member['wkId'] ?? null,
$member['meldefrist'] ?? null,
$member['bemerkungen'] ?? null,
shiai::fromArray(($shiai != null) ? $shiai : $member)
);
}
/// Einen Starter per userId mit typeId zu einem Event per eventId hinzufügen
/// Es erfolgt keine Überprüfung der Meldeberechtigung!
public static function addStarter($dbConnection, $starter)
{
$retMessage = [];
$query = 'INSERT INTO `wkParticipo_Starter` (eventId, userId, type) values (:eventId, :userId, :typeId);';
$params = [
':eventId' => ['value' => $starter->getEventId(), 'data_type' => PDO::PARAM_INT],
':userId' => ['value' => $starter->getUserId(), 'data_type' => PDO::PARAM_INT],
':typeId' => ['value' => $starter->getTypeId(), 'data_type' => PDO::PARAM_INT]
];
return dbConnector::query($query, $params);
}
// @todo docu
public static function getHtmlRemoveStarterForm($eventId, $userId, $class = null)
{
$form =
'<form ' . (isset($class) ? ('class="' . $class . '"') : '') . ' action="api.starter.remove.php" method="post">'
. '<input type="hidden" name="returnToUrl" id="returnToUrl" value="' . urlencode(getCurPagesUrl()) . '" >'
. '<input type="hidden" name="eventId" id="eventId" value="' . $eventId . '">'
. '<input type="hidden" name="userId" id="userId" value="' . $userId . '">'
. '<button class="btn red" type="submit" name="submit">austragen</button>'
. '</form>';
return $form;
}
public function getHtmlAddStarterForm($user)
{
$key = isset($_SESSION['apiKey']) ? $_SESSION['apiKey'] : null;
$form =
'<form class="card col s6 m4" action="api.starter.add.php" method="post">'
. '<input type="hidden" name="eventId" id="eventId" value="' . $this->id . '">'
. '<input type="hidden" name="userId" id="userId" value="' . $user->getId() . '">'
. '<input type="hidden" name="returnToUrl" id="returnToUrl" value="' . urlencode(getCurPagesUrl()) . '" >'
. '<div class="input-field">'
. '<select id="selectTypeForm" name="type">'
. '<option value="1" selected="">als Starter</option>'
. '<option value="2">als Zuschauer</option>'
. '<option value="3">keine Teilnahme</option>'
. '</select>'
. '<label for="selectTypeForm">' . $user->getName() . ', ' . $user->getFirstname() . '</label>'
. '</div>'
. '<button class="btn" type="submit" name="submit">einschreiben</button>'
. '</form>';
return $form;
}
} // end class event

258
homepage/participo/lib/participoLib/participo.php
View File

@@ -1,28 +1,40 @@
<?php <?php
require_once 'participoLib/dbConnector.php'; require_once 'participoLib/dbConnector.php';
// require_once("spyc/Spyc.php"); require_once 'participoLib/user.php';
/**
* FrameWork for the participoApp
*/
class participo class participo
{ {
private static $db = null; private static $db = null;
private static $message = ['error' => null, 'success' => null, 'notice' => null]; private static $message = ['error' => null, 'success' => null, 'notice' => null];
private static $userId = null; private static $userId = null;
/** /** Returns the current login status
* Returns the current login status
* *
* The login status is stored in the session cookie. If it is not even set it means the login is invalid. * The login status is stored in the session cookie. If it is not even set it means the login is invalid.
* *
* @return The login status or false if none is set so far * @return bool true if the login status is true, false otherwise
*/ */
public static function isLoginValid() public static function isLoginValid()
{ {
return ($_SESSION['login'] ?? false); return (isset($_SESSION) && array_key_exists('login', $_SESSION) && $_SESSION['login'] == true);
} }
/** /** Remove all login data from the session data
* A little Box with the login status as html entity *
* @return void
*/
public static function logout()
{
foreach (['login', 'user'] as $key) {
unset($_SESSION[$key]);
}
}
/** A little Box with the login status as html entity
* *
* @return string htmlEntity showing the login status * @return string htmlEntity showing the login status
*/ */
@@ -36,48 +48,54 @@ class participo
'</div>'; '</div>';
} }
/** /** Checking if an action is allowed. A present apiKey overrides (and deletes) a present login.
* Checks, if there already is a valid login, if not redirect to the login form *
* @todo rename to authenticate * 1. If apiKey is present:
* - chancel current login
* - If apiKey is valid for requested action:
* - set some session data
* - return
* 2. If there is a valid Login session:
* - return
* 3. redirect to Login Page
*
* @todo rename to authenticate (authorize?)
*
* @param $action the action we want to get authorized for (default=['login'])
* *
* @retval void * @retval void
*/ */
public static function authentificate() public static function authentificate($action = ['login'])
{ {
// Ensure a session is started
session_start(); session_start();
// check if an api key was received // check if an apiKey was received
if (array_key_exists('apiKey', $_GET)) { if (array_key_exists('apiKey', $_GET)) {
self::logout();
$key = ApiKey::loadFromDb($_GET['apiKey']); $key = ApiKey::loadFromDb($_GET['apiKey']);
if ($key) { if (isset($key) && $key->isValidFor($action)) {
if ($key->isValidFor('login')) { $user = User::loadFromDb($key->getUserId());
// query *all* users with the entered name // case valid login: Set the session data
// @todo check for e.g., len(user)=1 $_SESSION = [
// @todo getUser? 'login' => true, //false,
$user = dbConnector::query( 'apiKey' => $key->getKey(),
'SELECT `id`, `loginName`, `config` FROM `wkParticipo_Users` WHERE `id` = :id', 'user' => [
['id' => ['value' => $key->getUserId(), 'data_type' => PDO::PARAM_INT]] 'username' => $user->getLoginName(),
); 'userId' => $user->getId(),
$user = $user[0]; 'userConfig' => $user->getConfig(),
]
// case valid login: Set the session data ];
$_SESSION = [ // we're not logged in, but authorized for the stuff we want to do. So don't redirect
'login' => true, return;
'user' => [ };
'username' => $user['loginName'],
'userId' => $user['id'],
'userConfig' => json_decode($user['config'], true)
]
];
};
}
} }
// if not returned yet: no login, no valid apiKey -> redirect to login page
if (!self::isLoginValid()) { if (!self::isLoginValid()) {
header('Location: login?returnToUrl=' . urlencode($_SERVER['REQUEST_URI'] . ($_POST['fragment'] ?? '')), true, 301); header('Location: login?returnToUrl=' . urlencode($_SERVER['REQUEST_URI'] . ($_POST['fragment'] ?? '')), true, 301);
exit(); // should'nt matter exit(); // shouldn't matter
} }
participo::$userId = $_SESSION['user']['userId'];
} }
public static function getMessages() public static function getMessages()
@@ -90,8 +108,7 @@ class participo
self::$message[$type] = (self::$message[$type] ?? '') . $message; self::$message[$type] = (self::$message[$type] ?? '') . $message;
} }
/** /** check password for user
* check password for user
* *
* @param string $loginName user who wants to get in * @param string $loginName user who wants to get in
* @param string $password password for the user * @param string $password password for the user
@@ -102,23 +119,17 @@ class participo
public static function checkCredentials($loginName, $password) public static function checkCredentials($loginName, $password)
{ {
sleep(1); // just to discourage brute force attacks sleep(1); // just to discourage brute force attacks
// Check for dbConnection // Check for dbConnection
if (!dbConnector::getDbConnection()) { if (!dbConnector::getDbConnection()) {
self::addMessage('error', '<div>No DbConnection available</div>'); self::addMessage('error', '<div>No DbConnection available</div>');
return false; return false;
} }
// query *all* users with the entered name $user = User::loadFromDbByLoginName($loginName);
// @todo check for e.g., len(user)=1
// @todo getUser?
$user = dbConnector::query(
'SELECT `id`, `loginName`, `pwHash`, `config` FROM `wkParticipo_Users` WHERE `loginName` = :loginName',
['loginName' => ['value' => $loginName, 'data_type' => PDO::PARAM_STR]]
);
$user = $user[0];
// If there is no such user OR the password isn't valid the login fails // If there is no such user OR the password isn't valid the login fails
if (empty($user) || !password_verify($password, $user['pwHash'])) { if ($user == null || !$user->verifyPassword($password)) {
sleep(5); // discourage brute force attacks sleep(5); // discourage brute force attacks
self::addMessage('error', '<div>Falsches Passwort oder LoginName</div>'); self::addMessage('error', '<div>Falsches Passwort oder LoginName</div>');
return false; return false;
@@ -129,9 +140,9 @@ class participo
$_SESSION = [ $_SESSION = [
'login' => true, 'login' => true,
'user' => [ 'user' => [
'username' => $user['loginName'], 'username' => $user->getLoginName(),
'userId' => $user['id'], 'userId' => $user->getId(),
'userConfig' => json_decode($user['config'], true) 'userConfig' => json_decode($user->getConfig(), true)
] ]
]; ];
@@ -142,8 +153,7 @@ class participo
return true; return true;
} }
/** /** Checks, if a user is an admin
* Checks, if a user is an admin
* *
* @param [type] $userId id of the user to check * @param [type] $userId id of the user to check
* @retval true user with id $userId has attribute "isAdmin" * @retval true user with id $userId has attribute "isAdmin"
@@ -154,8 +164,48 @@ class participo
return self::hasUserAttribute($userId, 'isAdmin'); return self::hasUserAttribute($userId, 'isAdmin');
} }
/** public static function getKids($userId = null)
* Checks, if a user as a certain attribute {
$userId = $userId ?? $_SESSION['user']['userId'] ?? null;
$query =
'SELECT * FROM `wkParticipo_Users` '
. 'INNER JOIN `vormundschaft` ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId` '
. 'WHERE `vormundschaft`.`userId` = :userId;';
$params = [':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]];
$response = dbConnector::query($query, $params);
$kids = [];
foreach ($response as $r) {
$kids[] = User::fromDbArray($r, ['id' => 'kidId']);
}
return $kids;
}
/** Check if one user is ward of another
*
* @param integer $kidId ID of the ward
* @param integer|null $userId ID of the guardian, if null it is tried to read it from the session data
* @return boolean true if kid is ward of user, false otherwise
*/
public static function isWardOf(int $kidId, int $userId = null)
{
// Try to get the Guard from the session data.
$userId = $userId ?? $_SESSION['user']['userId'] ?? null;
$query = 'SELECT `kidId` FROM `vormundschaft` WHERE `userId` = :userId AND `kidId` = :kidId;';
$params = [
':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT],
':kidId' => ['value' => $kidId, 'data_type' => PDO::PARAM_INT]
];
$response = dbConnector::query($query, $params);
return (count($response) >= 1);
}
/** Checks, if a user as a certain attribute
* *
* @param [type] $userId id of the user to check * @param [type] $userId id of the user to check
* @param [type] $attributeName string name of the attribute to check * @param [type] $attributeName string name of the attribute to check
@@ -207,22 +257,20 @@ FROM `wkParticipo_Starter`
WHERE `wkParticipo_Events`.`date` >= $sinceDate AND `vormundschaft`.`userId` = $userId WHERE `wkParticipo_Events`.`date` >= $sinceDate AND `vormundschaft`.`userId` = $userId
ORDER BY `wkParticipo_Events`.`date` DESC; ORDER BY `wkParticipo_Events`.`date` DESC;
SQL; SQL;
$commingStarts = dbConnector::query($query); $comingStarts = dbConnector::query($query);
return $commingStarts; return $comingStarts;
} }
} }
/** /** Action element of an MaterializeCss (App-)card
* Action element of an MaterializeCss (App-)card
*/ */
class AppCardAction class AppCardAction
{ {
private $caption = null; //< Caption for the action private $caption = null; //< Caption for the action
private $link = '.'; //< link for the action private $link = '.'; //< link for the action
/** /** Constructor for the AppAction
* Constructor for the AppAction
* *
* @param string $caption caption for the action * @param string $caption caption for the action
* @param string $link link to the action * @param string $link link to the action
@@ -234,8 +282,7 @@ class AppCardAction
$this->caption = $caption; $this->caption = $caption;
} }
/** /** Create htmlCode for the action
* Create htmlCode for the action
* *
* @return string with htmlCode of the action * @return string with htmlCode of the action
*/ */
@@ -244,8 +291,7 @@ class AppCardAction
return '<a href="' . $this->link . '">' . $this->caption . '</a>'; return '<a href="' . $this->link . '">' . $this->caption . '</a>';
} }
/** /** Create AppCardAction from assoziative array
* Create AppCardAction from assoziative array
* *
* @param array $member array with the member values * @param array $member array with the member values
* @return AppCardAction * @return AppCardAction
@@ -258,8 +304,7 @@ class AppCardAction
} }
} }
/** /** MaterializeCss card for an App
* MaterializeCss card for an App
*/ */
class AppCard class AppCard
{ {
@@ -331,8 +376,7 @@ class AppCard
} }
} }
/** /** Generate a html table of the last logins of the users
* Generate a html table of the last logins of the users
* *
* @param string $jsonFileName path to the json file with the logged logins * @param string $jsonFileName path to the json file with the logged logins
* @return string Html table of users last logins * @return string Html table of users last logins
@@ -387,11 +431,10 @@ function htmlRetMessage($anRetMessage)
return $retHtmlString; return $retHtmlString;
} }
/** /** load a MarkdownFile with yaml header
* load a MarkdownFile with yaml header
* *
* @param string $fileName filename of the markdown file * @param string $fileName filename of the markdown file
* @return array assocative array('yaml'=>array(..), 'mdText'=>string) containing the yamlHeader as associative array and the markdown text as string * @return array associative array('yaml'=>array(..), 'mdText'=>string) containing the yamlHeader as associative array and the markdown text as string
*/ */
function loadMarkdownFile($fileName) function loadMarkdownFile($fileName)
{ {
@@ -399,7 +442,7 @@ function loadMarkdownFile($fileName)
$fileText = file_get_contents($fileName); $fileText = file_get_contents($fileName);
// split at '---' to get ((),yamls,array) // split at '---' to get ((),yamls,array)
$fileParts = preg_split('/[\n]*[-]{3}[\n]/', $fileText, 3); $fileParts = preg_split('/[\n]*[-]{3}[\n]/', $fileText, 3);
// not all mdfiles have a yamlHeader, so the mdText can be at different indices // not all mdFiles have a yamlHeader, so the mdText can be at different indices
$yaml = []; $yaml = [];
$mdText = ''; $mdText = '';
switch(count($fileParts)) { switch(count($fileParts)) {
@@ -433,8 +476,7 @@ function loadMarkdownFile($fileName)
]; ];
} }
/** /** Log the Login of an user into a logFile
* Log the Login of an user into a logFile
* *
* @param string $userName name of the user * @param string $userName name of the user
* @param string $fileName filename to log to * @param string $fileName filename to log to
@@ -460,64 +502,18 @@ function logLoginsToJsonFile($userName, $fileName = 'lastLogins.json')
} }
} }
/** /// @brief Gibt die URL der gerade aufgerufenen Seite zurück
* User for the Participo system function getCurPagesUrl()
*/
class User
{ {
private $id; $pageURL = 'http';
private $loginName; if ($_SERVER['HTTPS'] == 'on') {
private $name; $pageURL .= 's';
private $firstName;
private $dateOfBirth;
private $eMail;
public function __construct($id, $loginName, $name, $firstName, $dateOfBirth, $eMail)
{
$this->id = (int) id;
$this->loginName = $loginName;
$this->name = $name;
$this->firstName = $firstName;
$this->dateOfBirth = $dateOfBirth != null ? DateTime::createFromFormat('Y-m-d', $dateOfBirth) : null;
$this->eMail = $eMail;
} }
$pageURL .= '://';
/** if ($_SERVER['SERVER_PORT'] != '80') {
* Create a User from an assoziative array like it is returned from db requests $pageURL .= $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . $_SERVER['REQUEST_URI'];
* } else {
* @param array $member associative array with the UserData from the dbRequest $pageURL .= $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
* @return User initialized user
*/
public static function fromDbArray($member)
{
return new User(
$member['id'] ?? null,
$member['loginName'] ?? null,
$member['name'] ?? null,
$member['vorname'] ?? null,
$member['gebDatum'] ?? null,
array_key_exist('eMail', $member) ? explode(',', $member['eMail']) : null
);
}
/**
* Export the User data into an associative array
*/
public function toAssoc()
{
return [
'id' => $this->id,
'loginName' => $this->loginName,
'name' => $this->name,
'vorname' => $this->firstName,
'gebDatum' => $this->dateOfBirth,
'eMail' => $this->eMail];
}
public function loadFromDb($dbConn, $id)
{
$this->set(
loadUserDataFromDb($dbConn, $id)
);
} }
return $pageURL;
} }

415
homepage/participo/lib/participoLib/planer.php
View File

@@ -1,341 +1,63 @@
<?php <?php
require_once 'participoLib/dbConnector.php';
require_once 'participoLib/apiKey.php'; require_once 'participoLib/apiKey.php';
require_once 'participoLib/shiai.php';
/** require_once 'participoLib/event.php';
* frame for a shiai require_once 'participoLib/starter.php';
*/
class Shiai
{
private $id = null; //< unique id
private $date = null; //< date of the shiai
private $name = null; //< name of the shiai as string
private $ageclasses = null; //< age classes as space separated Uxy in a string
private $place = null; //< place of the shiai as string
private $announcementUrl = null; //< url to the announcement
private $routeUrl = null; //< url to a routing planner
private $galleryUrl = null; //< url of the gallery to a gallery of the shiai
private $promoImgUrl = null; //< promotional image for the shiai (as url)
public function __construct($id, $date, $name, $ageclasses, $place, $announcementUrl, $routeUrl, $galleryUrl, $promoImgUrl)
{
//! @todo input validation and sanitation
$this->id = (int) $id;
$this->date = DateTime::createFromFormat('Y-m-d', $date);
$this->name = $name;
$this->ageclasses = $ageclasses;
$this->place = $place;
$this->announcementUrl = $announcementUrl;
$this->routeUrl = $routeUrl;
$this->galleryUrl = $galleryUrl;
$this->promoImgUrl = $promoImgUrl;
}
public function getId()
{
return $this->id;
}
public function getName()
{
return ($this->name != null ? $this->name : 'Wettkampf ohne Namen');
}
public function getHtmlDate()
{
return ($this->date != null ? $this->date->format('Y-m-d') : 'fehlendes Datum');
}
public function getAgeClasses()
{
return ($this->ageclasses != null ? $this->ageclasses : '-');
}
public function getPlace()
{
return ($this->place != null ? $this->place : '-');
}
public static function fromArray($member)
{
return new shiai(
$member['lfdeNr'] ?? null,
$member['Datum'] ?? null,
$member['Veranstaltung'] ?? '<fehlender Name>',
$member['Altersklassen'] ?? null,
$member['Ort'] ?? '<fehlender Ort>',
$member['Ausschreibung'] ?? null,
$member['Routenplaner'] ?? null,
$member['galleryLink'] ?? null,
$member['promoPic'] ?? null
);
}
/**
* shiai event as html code for displaying
*
* @return html formated string
*/
public function getHtml()
{
$retHtml = '';
$retHtml =
'<div>' .
'<h3>' . $this->getName() . '</h3>' .
'<dl>' .
'<dt>Datum:</dt><dd>' . $this->getHtmlDate() . '</dd>' .
'<dt>Altersklassen</dt><dd>' . $this->getAgeClasses() . '</dd>' .
'<dt>Ort</dt><dd>' . $this->getPlace() . '</dd>' .
'</dl>' .
'</div>';
return $retHtml;
}
} // end class shiai
/**
* Framework for a event
*/
class Event
{
private $id = null; //< unique id of the event in the db
private $date = null; //< date for the event (@todo ranges?)
private $shiaiId = null; //< unique id of the shiai in the db (if appropriate)
private $deadline = null; //< until when one can register for the event
private $remarks = null; //< remarks to the event (special rules) or a json object for missing data (e.g. non-shiai events)
private $shiai = null; //< a place to load the linked shiai to (if loaded)
/**
* constructor
*
* @param int $id id in the database
* @param string $date date of the event as string in the format "YYYY-MM-DD"
* @param int $shiaiId id of the linked shiai or null if not appropriate
* @param string $deadline deadline for sign ins in the format "YYYY-MM-DD"
* @param string $remarks (json formatted) string with meta information
* @param Shiai $shiai if the shiai is loaded anyway it can be placed here.
*/
public function __construct($id, $date, $shiaiId, $deadline, $remarks, $shiai)
{
//! @todo InputValidation
$this->id = (int) $id;
$this->date = DateTime::createFromFormat('Y-m-d', $date);
$this->shiaiId = (($shiaiId != null) ? ((int)$shiaiId) : (null));
$this->deadline = DateTime::createFromFormat('Y-m-d', $deadline);
$this->remarks = $remarks;
$this->shiai = $shiai;
}
/**
* Representation of an event as (materializeCss) card
*
* @return string string with the html code of the event
*/
public function asHtmlCard()
{
return
'<div class="card blue-grey darken-1">' .
'<div class="card-content white-text">' .
'<span class="card-title">' . $this->shiai->getName() . '</span>' .
'<dl>' .
'<dt>Datum</dt>' .
'<dd>' . $this->date->format('Y-m-d') . '</dd>' .
'<dt>Meldefrist</dt>' .
'<dd>' . $this->deadline->format('Y-m-d') . '</dd>' .
'<dt>Altersklassen</dt>' .
'<dd>' . $this->shiai->getAgeClasses() . '</dd>' .
'</div>' .
'</div>';
}
public function htmlTableRow()
{
return
'<tr>' .
'<td>' . $this->date->format('Y-m-d') . '</td>' .
'<td><a href="/pages/desktop/wkParticipo/showWkEvent.php?eventId=' . $this->id . '" >' . $this->shiai->getName() . '</a></td>' .
'<td><a class="waves-effect waves-light btn-floating modal-trigger" href="#event-modal-' . $this->id . '"><i class="material-icons">zoom_in
</i></a></td>' .
'</tr>';
}
public function htmlModal()
{
return
'<div id="event-modal-' . $this->id . '" class="modal black-text">' .
'<div class="modal-content">' .
$this->shiai->getHtml() .
'</div>' . // end modal content
'<div class="modal-footer">' .
'<a href="/pages/desktop/wkParticipo/showWkEvent.php?eventId=' . $this->id . '" class="modal-close waves-effect waves-green btn-flat">Zum Event im Planer</a>' .
'<a href="#!" class="modal-close waves-effect waves-green btn-flat">Schließen</a>' .
'</div>' .
'</div>';
}
public static function fromArray($member)
{
$shiai = json_decode($member['bemerkungen'], true);
return new event(
$member['id'] ?? null,
$member['date'] ?? null,
$member['wkId'] ?? null,
$member['meldefrist'] ?? null,
$member['bemerkungen'] ?? null,
shiai::fromArray(($shiai != null) ? $shiai : $member)
);
}
/// Einen Starter per userId mit typeId zu einem Event per eventId hinzufügen
/// Es erfolgt keine Überprüfung der Meldeberechtigung!
public static function addStarter($dbConnection, $starter)
{
$retMessage = [];
$query = 'INSERT INTO `wkParticipo_Starter` (eventId, userId, type) values (:eventId, :userId, :typeId);';
$params = [
':eventId' => ['value' => $starter->getEventId(), 'data_type' => PDO::PARAM_INT],
':userId' => ['value' => $starter->getUserId(), 'data_type' => PDO::PARAM_INT],
':typeId' => ['value' => $starter->getTypeId(), 'data_type' => PDO::PARAM_INT]
];
return dbConnector::query($query, $params);
}
} // end class event
abstract class StartingType
{
const __default = null;
const Fighter = 1;
const Audience = 2;
const NoParticipation = 3;
/**
* convert a variable into a StartingType
*
* @param [int] $type starting type candidate
* @return int representation of the StartingType if successful converted, otherwise null
*/
public static function toStartingType($type)
{
return filter_var($type, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1, 'max_range' => 3]]);
}
/**
* string representations of the starting type
*
* @var array array of StartingType=> its string representation
*/
public static $AsString = [1 => 'Kämpfer', 2 => 'Zuschauer', 3 => 'keine Teilnahme'];
}
class Starter
{
private $id = null; //< id of the event in the database
private $eventId = null; //< dbId of the event one is starting
private $typeId = null; //< type(id) of the starter
private $userId = null; //< id of the starting user
private $rideId = null; //< id of the ride where the starter can car pool
private $mass = null; //< mass in kg on the scale
private $result = null; //< result of the start (array of places if multi start)
// Getter for the member
public function getId()
{
return $this->id;
}
public function getEventId()
{
return $this->eventId;
}
public function getTypeId()
{
return $this->typeId;
}
public function getUserId()
{
return $this->userId;
}
public function getRideId()
{
return $this->rideId;
}
public function getMass()
{
return $this->mass;
}
public function getResult()
{
return $this->result;
}
/**
* Construtor
*
* @todo Document
* @todo Rethink validation: filter_var is supposed to return the converted value in case of success. But the reference didn't say anything about not success...
*/
public function __construct($id, $eventId, $typeId, $userId, $rideId, $mass, $result)
{
$this->id = filter_var($id, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->eventId = filter_var($id, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->typeId = StartingType::toStartingType($type);
$this->userId = filter_var($id, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->rideId = filter_var($id, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->mass = filter_var($mass, FILTER_VALIDATE_FLOAT, ['options' => ['default' => null, 'min_range' => 0.0]]);
if (is_iterable($result)) {
$this->result = [];
foreach ($result as $r) {
$r = filter_var($r, FILTER_VAR_INT, ['options' => ['default' => null, 'min_range' => 0]]);
if ($r) {
array_push($this->result, $r);
}
}
} else {
$this->$result = filter_var($r, FILTER_VAR_INT, ['options' => ['default' => null, 'min_range' => 0]]);
}
}
// create starter from assoc array
public static function create($parameter)
{
$id = $parameter['id'] ?? null; //< id of the event in the database
$eventId = $parameter['eventId'] ?? null; //< dbId of the event one is starting
$typeId = $parameter['typeId'] ?? null; //< type(id) of the starter
$userId = $parameter['userId'] ?? null; //< id of the starting user
$rideId = $parameter['rideId'] ?? null; //< id of the ride where the starter can car pool
$mass = $parameter['mass'] ?? null; //< mass in kg on the scale
$result = $parameter['result'] ?? null; //< result of the start (array of places if multi start)
return new Starter($id, $eventId, $typeId, $userId, $rideId, $mass, $result);
}
}
class eventPlaner class eventPlaner
{ {
private static $db = null; // db table column names
private static $dbTable = [
'events' => 'wkParticipo_Events',
'starts' => 'wkParticipo_Starter',
'user' => 'wkParticipo_Users',
'shiaiCal' => 'wettkampfkalender',
'wardship' => 'vormundschaft'
];
// set the dbConnection (just setting, no establishing) private static function getComingStarts($sinceDate = null, $userId = null)
public static function setDbConnection($dbConnection)
{ {
if ($dbConnection instanceof PDO) { $userId = $userId ?? $_SESSION['user']['userId'];
self::$db = $dbConnection; $sinceDate = $sinceDate ?? new DateTime();
} else {
self::$db = null; $params = [
} ':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT],
return; ':sinceDate' => ['value' => $sinceDate->format('Y-m-d'), 'data_type' => PDO::PARAM_STR]
];
// shorter variable names for better readability
$starts = self::$dbTable['starts'];
$user = self::$dbTable['user'];
$events = self::$dbTable['events'];
$shiaiCal = self::$dbTable['shiaiCal'];
$wardship = self::$dbTable['wardship'];
$query =
'SELECT '
. '`' . $events . '`.`id` as eventId, '
. '`' . $events . '`.`date` as eventDate, '
. '`' . $events . '`.`meldefrist` as deadline, '
. '`' . $starts . '`.`id` as starterId, '
. '`' . $user . '`.`id` as userId, '
. '`' . $user . '`.`name` as userName, '
. '`' . $user . '`.`vorname` as userFirstname, '
. '`' . $shiaiCal . '`.`veranstaltung` as eventName '
. 'FROM `' . $starts . '` '
. 'LEFT JOIN `' . $user . '` ON `' . $starts . '`.`userId` = `' . $user . '`.`id` '
. 'LEFT JOIN `' . $events . '` ON `' . $starts . '`.`eventId` = `' . $events . '`.`id` '
. 'LEFT JOIN `' . $shiaiCal . '` ON `' . $events . '`.`wkId` = `' . $shiaiCal . '`.`lfdeNr` '
. 'LEFT JOIN `' . $wardship . '` ON `' . $user . '`.`id` = `' . $wardship . '`.`kidId` '
. 'WHERE `' . $events . '`.`date` >= :sinceDate AND ( `' . $wardship . '`.`userId` = :userId OR `' . $starts . '`.`userId` = :userId ) '
. 'ORDER BY `' . $events . '`.`date` DESC;';
$comingStarts = dbConnector::query($query, $params);
return $comingStarts;
} }
public static function getCommingWkEvents($someOptions = []) public static function getComingWkEvents($someOptions = [])
{ {
// wir befinden uns in der Übergangsphase: // wir befinden uns in der Übergangsphase:
// - als Standard wird das derzeitige Verhalten definiert (ISO-8859-1 // - als Standard wird das derzeitige Verhalten definiert (ISO-8859-1
@@ -365,7 +87,7 @@ class eventPlaner
'ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ' . 'ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ' .
'WHERE wkParticipo_Events.date >= CURDATE() ' . 'WHERE wkParticipo_Events.date >= CURDATE() ' .
'ORDER BY wkParticipo_Events.date;'; 'ORDER BY wkParticipo_Events.date;';
$ret = dbQuery(self::$db, $query); $ret = dbConnector::query($query);
$events = []; $events = [];
foreach ($ret as $event) { foreach ($ret as $event) {
array_push($events, event::fromArray($event)); array_push($events, event::fromArray($event));
@@ -385,4 +107,37 @@ class eventPlaner
} }
return $ret; return $ret;
} }
// inserting html code
/** Generate the htmlCode for the list of upcoming starts of
*
* @return void
*/
public static function htmlComingStarts()
{
$comingStarts = self::getComingStarts();
$htmlTable = null;
if ($comingStarts) {
$htmlTable = '<table>'
. '<thead><tr><th>Datum</th><th>Veranstaltung</th><th>Starter</th><th></th></tr></thead>'
. '<tbody>';
foreach ($comingStarts as $s) {
$eventDeadline = DateTime::createFromFormat('Y-m-d', $s['deadline']);
$today = new DateTime();
$htmlTable .= '<tr>'
. '<td>' . $s['eventDate'] . '</td>'
. '<td>' . $s['eventName'] . '</td>'
. '<td>' . $s['userName'] . ', ' . $s['userFirstname'] . '</td>'
. '<td>' . ($eventDeadline <= $today ? Event::getHtmlRemoveStarterForm($s['eventId'], $s['userId']) : '') . '</td>'
. '</tr>';
}
$htmlTable .= '</tbody></table>';
echo('<h2 id="comingStarts">Aktuelle Einschreibungen</h2>');
echo($htmlTable);
} else {
echo('<div>Keine Meldungen zu bevorstehenden Events<div>');
}
return;
}
} }

94
homepage/participo/lib/participoLib/shiai.php Normal file
View File

@@ -0,0 +1,94 @@
<?php
/** frame for a shiai
*/
class Shiai
{
private $id = null; //< unique id
private $date = null; //< date of the shiai
private $name = null; //< name of the shiai as string
private $ageclasses = null; //< age classes as space separated Uxy in a string
private $place = null; //< place of the shiai as string
private $announcementUrl = null; //< url to the announcement
private $routeUrl = null; //< url to a routing planner
private $galleryUrl = null; //< url of the gallery to a gallery of the shiai
private $promoImgUrl = null; //< promotional image for the shiai (as url)
public function __construct($id, $date, $name, $ageclasses, $place, $announcementUrl, $routeUrl, $galleryUrl, $promoImgUrl)
{
//! @todo input validation and sanitation
$this->id = (int) $id;
$this->date = DateTime::createFromFormat('Y-m-d', $date);
$this->name = $name;
$this->ageclasses = $ageclasses;
$this->place = $place;
$this->announcementUrl = $announcementUrl;
$this->routeUrl = $routeUrl;
$this->galleryUrl = $galleryUrl;
$this->promoImgUrl = $promoImgUrl;
}
public function getId()
{
return $this->id;
}
public function getHtmlName()
{
$name = ($this->name != null ? $this->name : 'Wettkampf ohne Namen');
foreach (['meisterschaft', 'turnier', 'randori'] as $fragment) {
str_replace($fragment, '&shy;', $name);
}
return $name;
}
public function getHtmlDate()
{
return ($this->date != null ? $this->date->format('Y-m-d') : 'fehlendes Datum');
}
public function getAgeClasses()
{
return ($this->ageclasses != null ? $this->ageclasses : '-');
}
public function getPlace()
{
return ($this->place != null ? $this->place : '-');
}
public static function fromArray($member)
{
return new shiai(
$member['lfdeNr'] ?? null,
$member['Datum'] ?? null,
$member['Veranstaltung'] ?? '<fehlender Name>',
$member['Altersklassen'] ?? null,
$member['Ort'] ?? '<fehlender Ort>',
$member['Ausschreibung'] ?? null,
$member['Routenplaner'] ?? null,
$member['galleryLink'] ?? null,
$member['promoPic'] ?? null
);
}
/**
* shiai event as html code for displaying
*
* @return html formated string
*/
public function getHtml()
{
$retHtml = '';
$retHtml =
'<div>' .
'<h3>' . $this->getHtmlName() . '</h3>' .
'<dl>' .
'<dt>Datum:</dt><dd>' . $this->getHtmlDate() . '</dd>' .
'<dt>Altersklassen</dt><dd>' . $this->getAgeClasses() . '</dd>' .
'<dt>Ort</dt><dd>' . $this->getPlace() . '</dd>' .
'</dl>' .
'</div>';
return $retHtml;
}
} // end class shiai

256
homepage/participo/lib/participoLib/starter.php Normal file
View File

@@ -0,0 +1,256 @@
<?php
/** Types of starting */
abstract class StartingType
{
public const __default = null;
public const Fighter = 1;
public const Audience = 2;
public const NoParticipation = 3;
/** convert a variable into a StartingType
*
* @param [int] $type starting type candidate
* @return int representation of the StartingType if successful converted, otherwise null
*/
public static function toStartingType($type)
{
return filter_var($type, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1, 'max_range' => 3]]);
}
/** string representations of the starting type
*
* @var array array of StartingType => its string representation
*/
public static $AsString = [1 => 'Kämpfer', 2 => 'Zuschauer', 3 => 'keine Teilnahme'];
}
/** Frame for a start to a shiai */
class Starter
{
private $id = null; //< id of the event in the database
private $eventId = null; //< dbId of the event one is starting
private $typeId = null; //< type(id) of the starter
private $userId = null; //< id of the starting user
private $rideId = null; //< id of the ride where the starter can car pool
private $mass = null; //< mass in kg on the scale
private $result = null; //< result of the start (array of places if multi start)
private $shiai = null; //< to store the shiai if needed
private $user = null;
/** columns in the table (in the database) with their type
*
* @var array
*/
private static $dbColumns = [
'id' => PDO::PARAM_INT,
'eventId' => PDO::PARAM_INT,
'type' => PDO::PARAM_INT,
'userId' => PDO::PARAM_INT,
'fahrtId' => PDO::PARAM_INT,
'masse' => PDO::PARAM_STR,
'platz' => PDO::PARAM_STR,
];
/** Constructor
*
* @todo Document
*/
public function __construct($id, $eventId, $typeId, $userId, $rideId = null, $mass = null, $result = null)
{
$this->id = filter_var($id, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->eventId = filter_var($eventId, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->typeId = StartingType::toStartingType($typeId);
$this->userId = filter_var($userId, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->rideId = filter_var($rideId, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 1]]);
$this->mass = filter_var($mass, FILTER_VALIDATE_FLOAT, ['options' => ['default' => null, 'min_range' => 0.0]]);
if (is_iterable($result)) {
$this->result = [];
foreach ($result as $r) {
$r = filter_var($r, FILTER_VAR_INT, ['options' => ['default' => null, 'min_range' => 0]]);
if ($r) {
array_push($this->result, $r);
}
}
} else {
$this->$result = filter_var($r, FILTER_VALIDATE_INT, ['options' => ['default' => null, 'min_range' => 0]]);
}
}
/** Create a Starter from an assoziative array like it is returned from db requests
*
* @param array $member associative array with the UserData from the dbRequest
* @param $columnMappings renaming of columnNames, e.g., if the id isn't under id in the array, add 'id'=>'starterId' to the mappings
* @return User initialized user
*/
public static function fromDbArray($member, $columnMappings = [])
{
// if it isn't remapped, take default column name
foreach (self::$dbColumns as $columnName => $columnDataType) {
if (!array_key_exists($columnName, $columnMappings)) {
$columnMappings[$columnName] = $columnName;
}
}
return new Starter(
$member[$columnMappings['id']] ?? null,
$member[$columnMappings['eventId']] ?? null,
$member[$columnMappings['type']] ?? null,
$member[$columnMappings['userId']] ?? null,
$member[$columnMappings['fahrtId']] ?? null,
$member[$columnMappings['masse']] ?? null,
$member[$columnMappings['platz']] ?? null
);
}
/** Load a starter from the db by a column
*
* @param [string] $name name of the column
* @param [mixed] $value value to look for
* @param [bool] $unique if the value is unique (true->return single value) or not (false->return array)
* @return loaded user or null (if sth. wrong)
*/
public static function loadFromDbBy($name, $value)
{
if (!array_key_exists($name, self::$dbColumns)) {
return null;
}
$response = dbConnector::query(
'SELECT * FROM `wkParticipo_Starter` WHERE `' . $name . '` = :' . $name,
[$name => ['value' => $value, 'data_type' => self::$dbColumns[$name]]]
);
if (count($response) != 1) {
return null;
}
return self::fromDbArray($response[0]);
}
/** Load a Starter from the db via an id
*
* @param int $starterId
* @return loaded starter or null (if sth. wrong)
*/
public static function loadFromDb($starterId)
{
return self::loadFromDbBy('id', $starterId);
}
/** Add a Start to the db
*
* - backend function no input validation/sanitation is done
*
* @param [int] $eventId eventId for the start
* @param [int] $typeId type(Id) for the start
* @param [int] $userId id of the starting user
* @return [int] lastInserted id of the Start
*/
private static function dbInsert($eventId, $typeId, $userId)
{
$query = 'INSERT INTO `cwsvjudo`.`wkParticipo_Starter` (eventId, type, userId) values (:eventId, :typeId, :userId);';
$params = [
':eventId' => ['value' => $eventId, 'data_type' => PDO::PARAM_INT],
':typeId' => ['value' => $typeId, 'data_type' => PDO::PARAM_INT],
':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]
];
$response = dbConnector::query($query, $params);
return dbConnector::getLastInsertId();
}
private static function dbDelete($eventId, $userId)
{
$query = 'DELETE FROM `cwsvjudo`.`wkParticipo_Starter` WHERE eventId = :eventId AND userId = :userId;';
$params = [
':eventId' => ['value' => $eventId, 'data_type' => PDO::PARAM_INT],
':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]
];
$response = dbConnector::query($query, $params);
return;
}
public function addToDb()
{
// - if the id is already set it *has* to be already in the DB hence we don't add it
// - the logged in user must have wardship over the starter
if (isset($this->id) && !participo::isWardOf($this->userId)) {
return null;
}
// You can only start once to an event so delete *all* other starts of this user to this event
self::dbDelete($this->eventId, $this->userId);
$this->id = self::dbInsert($this->eventId, $this->typeId, $this->userId);
return $this->id;
}
public function removeFromDb()
{
// - the logged in user must have wardship over the starter
if (!participo::isWardOf($this->userId)) {
return null;
}
self::dbDelete($this->eventId, $this->userId);
return;
}
// create starter from assoc array
public static function create($parameter)
{
$id = $parameter['id'] ?? null; //< id of the event in the database
$eventId = $parameter['eventId'] ?? null; //< dbId of the event one is starting
$typeId = $parameter['typeId'] ?? null; //< type(id) of the starter
$userId = $parameter['userId'] ?? null; //< id of the starting user
$rideId = $parameter['rideId'] ?? null; //< id of the ride where the starter can car pool
$mass = $parameter['mass'] ?? null; //< mass in kg on the scale
$result = $parameter['result'] ?? null; //< result of the start (array of places if multi start)
return new Starter($id, $eventId, $typeId, $userId, $rideId, $mass, $result);
}
// Getter for the member
public function getId()
{
return $this->id;
}
public function getEventId()
{
return $this->eventId;
}
public function getTypeId()
{
return $this->typeId;
}
public function getUserId()
{
return $this->userId;
}
public function getRideId()
{
return $this->rideId;
}
public function getMass()
{
return $this->mass;
}
public function getResult()
{
return $this->result;
}
public function getUser()
{
return User::loadFromDb($this->userId);
}
}

176
homepage/participo/lib/participoLib/user.php Normal file
View File

@@ -0,0 +1,176 @@
<?php
/**
* User for the Participo system
*/
class User
{
private $id;
private $loginName;
private $name;
private $firstName;
private $dateOfBirth;
private $eMail;
private $config;
private $pwHash;
/** columns in the user table (in the database) with their type
*
* @var array
*/
private static $dbColumns = [
'id' => PDO::PARAM_INT,
'loginName' => PDO::PARAM_STR,
'name' => PDO::PARAM_STR,
'vorname' => PDO::PARAM_STR,
'gebDatum' => PDO::PARAM_STR,
'eMail' => PDO::PARAM_STR,
'pwHash' => PDO::PARAM_STR,
'config' => PDO::PARAM_STR
];
/** Constructor
* @todo Document parameter
* @todo Input sanitation
*/
public function __construct($id, $loginName, $name, $firstName, $dateOfBirth, $eMail, $config, $pwHash)
{
$this->id = (int) $id;
$this->loginName = $loginName;
$this->name = $name;
$this->firstName = $firstName;
$this->dateOfBirth = $dateOfBirth != null ? DateTime::createFromFormat('Y-m-d', $dateOfBirth) : null;
$this->eMail = $eMail;
$this->config = $config;
$this->pwHash = $pwHash;
}
/** Export the User data into an associative array
*
* @return array associative array representing the user
*/
public function toAssoc()
{
return [
'id' => $this->id,
'loginName' => $this->loginName,
'name' => $this->name,
'vorname' => $this->firstName,
'gebDatum' => $this->dateOfBirth,
'eMail' => $this->eMail,
'config' => $this->config,
'pwHash' => $this->pwHash
];
}
/** verify the users password
*
* @param [string] $password the password to verify
* @return true if password is verified, false otherwise
*/
public function verifyPassword($password)
{
return password_verify($password, $this->pwHash);
}
// getter functions
public function getId()
{
return $this->id;
}
public function getLoginName()
{
return $this->loginName;
}
public function getName()
{
return $this->name;
}
public function getFirstname()
{
return $this->firstName;
}
public function getConfig()
{
return $this->$config;
}
// static functions
/** Create a User from an assoziative array like it is returned from db requests
*
* @param array $member associative array with the UserData from the dbRequest
* @param $columnMappings renaming of columnNames, e.g., if the id isn't under id in the array, add 'id'=>'userId' to the mappings
* @return User initialized user
*/
public static function fromDbArray($member, $columnMappings = [])
{
// if it isn't remapped, take default column name
foreach (self::$dbColumns as $columnName => $columnDataType) {
if (!array_key_exists($columnName, $columnMappings)) {
$columnMappings[$columnName] = $columnName;
}
}
return new User(
$member[$columnMappings['id']] ?? null,
$member[$columnMappings['loginName']] ?? null,
$member[$columnMappings['name']] ?? null,
$member[$columnMappings['vorname']] ?? null,
$member[$columnMappings['gebDatum']] ?? null,
array_key_exists($columnMappings['eMail'], $member) ? explode(',', $member['eMail']) : null,
array_key_exists($columnMappings['config'], $member) ? json_decode($member['config']) : null,
array_key_exists($columnMappings['pwHash'], $member) ? $member['pwHash'] : null
);
}
/** Load an User from the db via an id
*
* @param int $userId
* @return loaded user or null (if sth. wrong)
*/
public static function loadFromDb($userId)
{
return self::loadFromDbBy('id', $userId);
}
/** Load an User from the db via the loginName
*
* @param int $login
* @return loaded user or null (if sth. wrong)
*/
public static function loadFromDbByLoginName($login)
{
return self::loadFromDbBy('loginName', $login);
}
/** Load a user from the db by a column
*
* @param [string] $name name of the column
* @param [mixed] $value value to look for
* @param [bool] $unique if the value is unique (true->return single value) or not (false->return array)
* @return loaded user or null (if sth. wrong)
*/
public static function loadFromDbBy($name, $value)
{
if (!array_key_exists($name, self::$dbColumns)) {
return null;
}
$response = dbConnector::query(
'SELECT * FROM `wkParticipo_Users` WHERE `' . $name . '` = :' . $name,
[$name => ['value' => $value, 'data_type' => self::$dbColumns[$name]]]
);
if (count($response) != 1) {
return null;
}
return User::fromDbArray($response[0]);
}
}

71
homepage/participo/test.py Normal file
View File

@@ -0,0 +1,71 @@
#! /usr/bin/env python
import sys
import html5lib
from selenium import webdriver
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.chrome.options import Options
from selenium.webdriver.common.by import By
# credentials
username = "marko"
password = "kodokan"
# initialize the Chrome driver
chromeOptions = Options()
chromeOptions.headless = True
driver = webdriver.Chrome(options=chromeOptions)
html5Parser = html5lib.HTMLParser(strict=True)
# head to login page
driver.get("http://cwsvjudo.bplaced.net/participo/")
# find username/email field and send the username itself to the input field
driver.find_element("id", "username").send_keys(username)
# find password input field and insert password as well
driver.find_element("id", "password").send_keys(password)
# click login button
driver.find_element("name", "submit").click()
# wait the ready state to be complete
WebDriverWait(driver=driver, timeout=10).until(
lambda x: x.execute_script("return document.readyState === 'complete'")
)
# Open the sidemenu if necessary
for m in driver.find_elements(By.CLASS_NAME, "material-icons"):
if m.text == "menu":
m.click()
try:
html5Parser.parse("<!DOCTYPE html > "+driver.page_source)
print("mainpage ok")
except Exception as e:
print(repr(e), file=sys.stderr)
print(driver.page_source)
loginText = "Angemeldet als " + username
divList = driver.find_elements(By.TAG_NAME, 'li')
if not any(loginText in d.text for d in divList):
print("login failed", file=sys.stderr)
driver.close()
driver.quit()
exit(-1)
for pageName in ["events", "attendance", "kyu", "user"]: # missing: "infoZettel"
driver.get("http://cwsvjudo.bplaced.net/participo/"+pageName)
try:
html5Parser.parse("<!DOCTYPE html>"+driver.page_source)
print(f"{pageName} ok")
except Exception as e:
print(repr(e), file=sys.stderr)
print(driver.page_source)
driver.close()
driver.quit()

24
homepage/participo/wk.api.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
set_include_path(get_include_path() . PATH_SEPARATOR . './lib/');
require_once 'config/participo.php';
require_once 'local/cwsvJudo.php';
require_once 'participoLib/participo.php';
$db = dbConnector::connect(
$cwsvJudoConfig['db']['host'],
$cwsvJudoConfig['db']['name'],
$cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password']
);
echo($db);
$wkSqlQuery = 'SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();';
$wkSqlResponse = dbConnector::query($wkSqlQuery);
header('Access-Control-Allow-Headers: *');
header('Access-Control-Allow-Origin: *');
echo(json_encode($wkSqlResponse));