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

- restructure includes

Browse Source 
- new participo functions: isAdmin, hasUserAttribute
This commit is contained in:
marko
2022-06-25 19:12:10 +02:00
parent 8329a6b2df
commit 1cf9365a77
7 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homepage/participo/config/participo.php
View File

@@ -5,4 +5,8 @@ $config['basePath'] = "/users/cwsvjudo/www";
$config['baseUrl'] = "http://cwsvjudo.bplaced.net"; $config['baseUrl'] = "http://cwsvjudo.bplaced.net";
$config['ressourceUrl'] = "http://cwsvjudo.bplaced.net/ressourcen"; $config['ressourceUrl'] = "http://cwsvjudo.bplaced.net/ressourcen";
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
set_include_path(get_include_path() . PATH_SEPARATOR . "./lib/");
set_include_path(get_include_path() . PATH_SEPARATOR . $config['basePath']."/ressourcen/");
?> ?>

24
homepage/participo/index.php
View File

@@ -1,19 +1,13 @@
<?php <?php
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); require_once("config/participo.php");
require_once("config/participo.php");
require_once("./local/dbConf.php");
require_once("./local/cwsvJudo.php"); require_once("./local/cwsvJudo.php");
require_once("./lib/db.php"); require_once("./lib/db.php");// should be replaced
require_once("./lib/api.php"); require_once("./lib/api.php");// should be replaced
require_once("./lib/participoLib/participo.php"); require_once("participoLib/participo.php");
require_once("./lib/participoLib/planer.php"); require_once("participoLib/planer.php");
require_once("./auth.php");
require_once($config['basePath']."/config/cwsvJudo.config.php");
require_once($config['basePath']."/config/phpcount.config.php");
dbConnector::connect( dbConnector::connect(
$cwsvJudoConfig["db"]["host"], $cwsvJudoConfig["db"]["host"],
@@ -21,9 +15,9 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
$cwsvJudoConfig["db"]["user"], $cwsvJudoConfig["db"]["user"],
$cwsvJudoConfig["db"]["password"] $cwsvJudoConfig["db"]["password"]
); );
$userData = getUserData(dbConnector::getDbConnection(), $_SESSION['user']['userId']);
eventPlaner::setDbConnection( dbConnector::getDbConnection() ); eventPlaner::setDbConnection( dbConnector::getDbConnection() );
participo::authentificate();
$userData = getUserData(dbConnector::getDbConnection(), $_SESSION['user']['userId']);
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@@ -80,7 +74,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
<li class="bold"> <li class="bold">
<a class="waves-effect waves-teal right-align" href="#configApps">Einstellen<i class="material-icons">settings</i></a> <a class="waves-effect waves-teal right-align" href="#configApps">Einstellen<i class="material-icons">settings</i></a>
</li> </li>
<?php if( isUserAdmin(dbConnector::getDbConnection(), $userData['id']) ){?> <?php if( participo::isUserAdmin( $userData['id']) ){?>
<li class="bold"> <li class="bold">
<a class="waves-effect waves-teal right-align" href="#admiStuff">adminStuff</a> <a class="waves-effect waves-teal right-align" href="#admiStuff">adminStuff</a>
</li> </li>
@@ -192,7 +186,7 @@ echo(
</div> <!-- configApps --> </div> <!-- configApps -->
<?php <?php
// AdminStuff, thats only visible for Admins // AdminStuff, thats only visible for Admins
if( isUserAdmin(dbConnector::getDbConnection(), $userData['id']) ){ if( participo::isUserAdmin( $userData['id'] ) ){
echo( echo(
"<h2>AdminStuff</h2>". "<h2>AdminStuff</h2>".
"<div id=\"admiStuff\" class=\"row\">". "<div id=\"admiStuff\" class=\"row\">".

6
homepage/participo/infoZettel.php
View File

@@ -1,9 +1,7 @@
<?php <?php
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
set_include_path(get_include_path() . PATH_SEPARATOR . "./lib/");
require_once("participoLib/participo.php");
require_once("config/participo.php"); require_once("config/participo.php");
require_once("participoLib/participo.php");
require_once("./local/dbConf.php"); require_once("./local/dbConf.php");
require_once("./local/cwsvJudo.php"); require_once("./local/cwsvJudo.php");

5
homepage/participo/kyu.php
View File

@@ -1,9 +1,8 @@
<?php <?php
require_once("./config/participo.php"); require_once("./config/participo.php");
//require_once("./auth.php");
require($config['basePath']."/ressourcen/parsedown/Parsedown.php"); require_once($config['basePath'] . "/ressourcen/parsedown/Parsedown.php");
require($config['basePath']."/ressourcen/spyc/Spyc.php"); require_once($config['basePath'] . "/ressourcen/spyc/Spyc.php");
$mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu"; $mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu";

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

@@ -1,4 +1,5 @@
<?php <?php
// require_once("spyc/Spyc.php");
class participo{ class participo{
private static $db = null; private static $db = null;
@@ -62,14 +63,17 @@ class participo{
return false; return false;
} }
// query all users with the entered name // query *all* users with the entered name
// @todo check for e.g., len(user)=1
// @todo getUser?
$user = dbConnector::query( $user = dbConnector::query(
"SELECT `id`, `loginName`, `pwHash`, `config` FROM `wkParticipo_Users` WHERE `loginName` = :loginName", "SELECT `id`, `loginName`, `pwHash`, `config` FROM `wkParticipo_Users` WHERE `loginName` = :loginName",
['loginName' => ['value'=>$loginName, 'data_type'=>PDO::PARAM_STR]] ['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( empty($user) || !password_verify( $password, $user['pwHash'])){
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;
@@ -80,9 +84,9 @@ class participo{
$_SESSION = array( $_SESSION = array(
'login' => true, 'login' => true,
'user' => array( 'user' => array(
'username' => $row['loginName'], 'username' => $user['loginName'],
'userId' => $row['id'], 'userId' => $user['id'],
'userConfig' => json_decode($row['config'], true) 'userConfig' => json_decode($user['config'], true)
) )
); );
@@ -92,6 +96,44 @@ class participo{
self::addMessage('success', "<div>Anmeldung erfolgreich</div>"); self::addMessage('success', "<div>Anmeldung erfolgreich</div>");
return true; return true;
} }
/**
* Checks, if a user is an admin
*
* @param [type] $userId id of the user to check
* @retval true user with id $userId has attribute "isAdmin"
* @retval false otherwise
*/
static function isUserAdmin($userId){
return self::hasUserAttribute( $userId, "isAdmin");
}
/**
* Checks, if a user as a certain attribute
*
* @param [type] $userId id of the user to check
* @param [type] $attributeName string name of the attribute to check
* @return boolean
*/
static public function hasUserAttribute($userId, $attributeName){
// sqlQuery: Select the user if it has the given attribute
$query = <<<SQL
SELECT `wkParticipo_user<=>userAttributes`.userId, `wkParticipo_userAttributes`.name
FROM `wkParticipo_user<=>userAttributes` LEFT JOIN `wkParticipo_userAttributes`
ON `wkParticipo_user<=>userAttributes`.`attributeId` = `wkParticipo_userAttributes`.`id`
WHERE `wkParticipo_userAttributes`.name = :attributeName AND userId=:userId;
SQL;
$params = array(
':userId' => array('value'=>$userId, 'data_type'=>PDO::PARAM_INT),
':attributeName' => array('value'=>$attributeName, 'data_type'=>PDO::PARAM_STR)
);
$attributedUsers = dbConnector::query($query, $params);
// Since the id should be unique, there should only be one result this is just for dealing with empty arrays
foreach($attributedUsers as $u)
if($u['userId']==$userId)
return true;
return false;
}
} }
/** /**
@@ -310,6 +352,9 @@ function loadMarkdownFile($fileName){
function logLoginsToJsonFile($userName, $fileName="lastLogins.json"){ function logLoginsToJsonFile($userName, $fileName="lastLogins.json"){
try{ try{
$lastLogins = json_decode(file_get_contents($fileName), true); $lastLogins = json_decode(file_get_contents($fileName), true);
if ($lastLogins == NULL){
return;
}
if(!array_key_exists($userName, $lastLogins)) if(!array_key_exists($userName, $lastLogins))
$lastLogins[$userName] = []; $lastLogins[$userName] = [];
if(!array_key_exists('lastLogins', $lastLogins[$userName])) if(!array_key_exists('lastLogins', $lastLogins[$userName]))
@@ -340,7 +385,7 @@ class dbConnector{
/// ':userId' => array('value'=>$anUserId, 'data_type'=>PDO::PARAM_INT), /// ':userId' => array('value'=>$anUserId, 'data_type'=>PDO::PARAM_INT),
/// ':attributeId'=> array('value'=>$anAttributeId, 'data_type'=>PDO::PARAM_INT) ) /// ':attributeId'=> array('value'=>$anAttributeId, 'data_type'=>PDO::PARAM_INT) )
/// @param $someOption /// @param $someOption
function query($aQueryString, $aBindArray = array(), $someOptions = array()){ public static function query($aQueryString, $aBindArray = array(), $someOptions = array()){
// Standardbelegungen // Standardbelegungen
if( empty($someOptions['dbCharset' ]) ) $someOptions['dbCharset' ] = "ISO-8859-1"; if( empty($someOptions['dbCharset' ]) ) $someOptions['dbCharset' ] = "ISO-8859-1";
if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8"; if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";

4
homepage/participo/login.php
View File

@@ -1,9 +1,7 @@
<?php <?php
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); require_once("config/participo.php");
set_include_path(get_include_path() . PATH_SEPARATOR . "./lib/");
require_once("participoLib/participo.php"); require_once("participoLib/participo.php");
require_once("config/participo.php");
require_once("./local/dbConf.php"); require_once("./local/dbConf.php");

3
homepage/participo/sidenav/kyu.php
View File

@@ -13,3 +13,6 @@
<li> <li>
<a href="kyu.php?kyu=4">4. Kyu - orange-grün</a> <a href="kyu.php?kyu=4">4. Kyu - orange-grün</a>
</li> </li>
<li>
<a href="kyu.php?kyu=A">Nage-no-kata</a>
</li>