From 269c680fe0e03669af607eecb30a5e935247ef05 Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 26 Jun 2022 19:24:14 +0200 Subject: [PATCH] removed auth usage, php-cs-fixer --- homepage/participo/attendance.php | 258 ++++++++++-------- homepage/participo/auth.php | 16 -- homepage/participo/index.php | 149 +++++----- homepage/participo/infoZettel.php | 80 +++--- .../participo/lib/participoLib/planer.php | 210 +++++++------- homepage/participo/user.php | 74 +++-- 6 files changed, 400 insertions(+), 387 deletions(-) delete mode 100644 homepage/participo/auth.php diff --git a/homepage/participo/attendance.php b/homepage/participo/attendance.php index 55e7edb..a053a52 100644 --- a/homepage/participo/attendance.php +++ b/homepage/participo/attendance.php @@ -1,41 +1,42 @@ id = (int)$id; $this->familyName = $familyName; $this->givenName = $givenName; } - static function fromArray($member){ + + public static function fromArray($member) + { $id = $member['id']; $familyName = $member['familyName']; $givenName = $member['givenName']; return new User($id, $familyName, $givenName); } - static function getUsers($db, $options = []){ - $attributeId = $options["attributeId"] ?? null; + + public static function getUsers($db, $options = []) + { + $attributeId = $options['attributeId'] ?? null; $params = []; - $query = "SELECT ". - "`cwsvjudo`.`wkParticipo_Users`.`id` AS `id`". - ", `cwsvjudo`.`wkParticipo_Users`.`vorname` AS `givenName`". - ", `cwsvjudo`.`wkParticipo_Users`.`name` AS `familyName`". - ", `cwsvjudo`.`wkParticipo_userAttributes`.`name` AS `attributeName`". - "FROM `cwsvjudo`.`wkParticipo_Users` ". - "JOIN `cwsvjudo`.`wkParticipo_user<=>userAttributes` ". - "ON `cwsvjudo`.`wkParticipo_Users`.`id` = `cwsvjudo`.`wkParticipo_user<=>userAttributes`.`userId`". - "JOIN `cwsvjudo`.`wkParticipo_userAttributes` ". - "ON `cwsvjudo`.`wkParticipo_user<=>userAttributes`.`attributeId` = `cwsvjudo`.`wkParticipo_userAttributes`.`id`"; - if($attributeId != null){ - $query .= " WHERE `cwsvjudo`.`wkParticipo_userAttributes`.`id` = :attributeId"; - $params['attributeId'] = ['value'=>$attributeId, 'data_type'=>PDO::PARAM_INT]; + $query = 'SELECT ' . + '`cwsvjudo`.`wkParticipo_Users`.`id` AS `id`' . + ', `cwsvjudo`.`wkParticipo_Users`.`vorname` AS `givenName`' . + ', `cwsvjudo`.`wkParticipo_Users`.`name` AS `familyName`' . + ', `cwsvjudo`.`wkParticipo_userAttributes`.`name` AS `attributeName`' . + 'FROM `cwsvjudo`.`wkParticipo_Users` ' . + 'JOIN `cwsvjudo`.`wkParticipo_user<=>userAttributes` ' . + 'ON `cwsvjudo`.`wkParticipo_Users`.`id` = `cwsvjudo`.`wkParticipo_user<=>userAttributes`.`userId`' . + 'JOIN `cwsvjudo`.`wkParticipo_userAttributes` ' . + 'ON `cwsvjudo`.`wkParticipo_user<=>userAttributes`.`attributeId` = `cwsvjudo`.`wkParticipo_userAttributes`.`id`'; + if ($attributeId != null) { + $query .= ' WHERE `cwsvjudo`.`wkParticipo_userAttributes`.`id` = :attributeId'; + $params['attributeId'] = ['value' => $attributeId, 'data_type' => PDO::PARAM_INT]; } - $query .= ";"; + $query .= ';'; $response = dbQuery($db, $query, $params); - + $users = []; - foreach( $response as $r){ + foreach ($response as $r) { $users[] = User::fromArray($r); } return $users; } - static function htmlTable($users){ - echo(""); - foreach( $users as $u){ - echo(""); + + public static function htmlTable($users) + { + echo('
IdNameVorname
".$u->id."".$u->familyName."".$u->givenName."
'); + foreach ($users as $u) { + echo(''); } - echo("
IdNameVorname
' . $u->id . '' . $u->familyName . '' . $u->givenName . '
"); + echo(''); } } /** * Datastructure and interface for attendances */ - class Attendance{ + class Attendance + { private $id = null; //< id in the db private $userId = null; //< user of the attendance private $date = null; //< date of the attendance - private $type = null; //< type of attendance - - static private $Types = [ - AttendanceType::Training => "Training" - , AttendanceType::Excused => "Entschuldigt" - , AttendanceType::Ill => "Krank" - , AttendanceType::SpecialTraining => "SonderTraining" - , AttendanceType::Competition => "Wettkampf" + private $type = null; //< type of attendance + + private static $Types = [ + AttendanceType::Training => 'Training', AttendanceType::Excused => 'Entschuldigt', AttendanceType::Ill => 'Krank', AttendanceType::SpecialTraining => 'SonderTraining', AttendanceType::Competition => 'Wettkampf' ]; - static private $NameOfMonth = [1=>"Januar", 2=>"Februar", 3=>"März", 4=>"April", 4=>"Mai", 6=>"Juni", 7=>"Juli", 8=>"August", 9=>"September", 10=>"Oktober", 11=>"November", 12=>"Dezember"]; + private static $NameOfMonth = [1 => 'Januar', 2 => 'Februar', 3 => 'März', 4 => 'April', 4 => 'Mai', 6 => 'Juni', 7 => 'Juli', 8 => 'August', 9 => 'September', 10 => 'Oktober', 11 => 'November', 12 => 'Dezember']; + /** * constructor * @@ -123,20 +131,24 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); * @param string/int $userId user of the attendance * @param string $date date of the attendance */ - function __construct($id, $userId, $date){ + public function __construct($id, $userId, $date) + { $this->id = (int)$id; $this->userId = (int)$userId; - $this->date = DateTime::createFromFormat("Y-m-d", $date); + $this->date = DateTime::createFromFormat('Y-m-d', $date); } + /** * create an Attendance from an assoziative array * * @param array $member * @return Attendance */ - static function constructFromArray($member){ + public static function constructFromArray($member) + { return new Attendance($member['id'], $member['userId'], $member['date']); } + /** * request a users attendances from the database * @@ -144,16 +156,18 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); * @param int/string $userId * @return array with attendances */ - static function getUsersAttendance($db, $userId){ + public static function getUsersAttendance($db, $userId) + { $userId = (int)$userId; - $query = "SELECT `id`, `date` FROM `cwsvjudo`.`anwesenheit` WHERE `userId` = :userId"; - $response = dbQuery($db, $query, [':userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT]]); + $query = 'SELECT `id`, `date` FROM `cwsvjudo`.`anwesenheit` WHERE `userId` = :userId'; + $response = dbQuery($db, $query, [':userId' => ['value' => $userId, 'data_type' => PDO::PARAM_INT]]); $attendances = []; - foreach($response as $r){ + foreach ($response as $r) { $attendances[] = new Attendance($r['id'], $userId, $r['date']); } return $attendances; } + /** * html table with users attendances * @@ -161,56 +175,61 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); * @param string/int $userId * @return string with html code of the attendance table */ - static function userAttendanceHtmlTable($db, $userId){ - $htmlTableString = ""; - $htmlTableString .= "'; return $htmlTableString; } + /** * group the attendances by year and month. * * @param list $attendances list of attendances - * @return array[int][int](list of int) array with a list of days for every month in every year - */ - static function groupAttendances($attendances){ + * @return array[int][int](list of int) array with a list of days for every month in every year + */ + public static function groupAttendances($attendances) + { $groupedAttendances = []; - foreach($attendances as $a){ - $year =(int) $a->date->format("Y"); - if(!array_key_exists($year, $groupedAttendances)) + foreach ($attendances as $a) { + $year = (int) $a->date->format('Y'); + if (!array_key_exists($year, $groupedAttendances)) { $groupedAttendances[$year] = []; - $month = (int) $a->date->format("m"); - if(!array_key_exists($month, $groupedAttendances[$year])) + } + $month = (int) $a->date->format('m'); + if (!array_key_exists($month, $groupedAttendances[$year])) { $groupedAttendances[$year][$month] = []; - $day = (int) $a->date->format("d"); - $groupedAttendances[$year][$month][]=$day; + } + $day = (int) $a->date->format('d'); + $groupedAttendances[$year][$month][] = $day; } return $groupedAttendances; } @@ -223,7 +242,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); - +