Abgleich mit dem Stand auf dem Server. Irgendwie sind hier Commits verloren/nie gemacht worden.

This commit is contained in:
marko
2019-12-24 14:22:53 +01:00
parent 18394392de
commit f60fef0904
32 changed files with 876 additions and 115 deletions

View File

@@ -1,4 +1,5 @@
<?php
$baseUrl = "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo";
require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php');
require_once('../local/db.php.inc');
@@ -18,6 +19,6 @@
<p><a href="./addEvent.php">Neuen Event anlegen.</a></p>
<p><a href="./listUsers.php">User anzeigen.</a></p>
<p><a href="./listEvents.php">Events anzeigen.</a></p>
<p><a href="<?php echo( $baseUrl."/lib/wkParticipo-userAttribute.php");?>">Attribute verteilen</a></p>
</body>
</html>

View File

@@ -1,18 +1,8 @@
<?php
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/phpcount.config.php");
require_once($basePath."/config/cwsvJudo.config.php");
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
$pdoDbConn = getCwsvJudoDbConn();
?>
<!DOCTYPE html>
<html>

View File

@@ -15,6 +15,7 @@
"WHERE kinder IS NOT NULL AND attribute LIKE '%wantsNewsletter=true%';";
$eMailErgebnis = $mysqlConn->query( $queryForEmailAdresses );
$eMailAdresses = $eMailErgebnis->fetchAll();
// foreach($eMailAdresses as $add) echo($add[0].", ");
// print_r($eMailAdresses);die();
$queryForEinschreibefristen =

View File

@@ -23,24 +23,24 @@ $basePath = "/users/cwsvjudo/www";
}
else{
if( (string)(int)$_POST['f']['eventId'] == $_POST['f']['eventId'] ){
$mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
if ($mysqlConn->connect_error) {
$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
$mysqli = @new mysqli($db_server, $db_user, $db_password, $db_name);
if ($mysqli->connect_error) {
$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
}
else{
// Abfrage der Eventdaten
$eventData = getWkEventData($mysqlConn, $_POST['f']['eventId'], array('outCharset'=>"UTF-8"));
$eventData = getWkEventData($mysqli, $_POST['f']['eventId'], array('outCharset'=>"UTF-8"));
if( empty($eventData) ) $message['error'] = 'Fehler: keine Eventdaten zurückgeliefert!';
else{
// Abfrage der Starterdaten des Events
$starterData = getStarterForEvent($mysqlConn, $eventData['id']);
$starterData = getStarterForEvent($mysqli, $eventData['id']);
// Abfrage der Fahrtdaten des Events
$fahrten = getFahrtenForEvent($mysqlConn, $eventData['id']);
$fahrten = getFahrtenForEvent($mysqli, $eventData['id']);
}
}
}
//var_dump($_POST);
var_dump($_POST);
if( $_POST['action'] == "deleteStarter" ){
try{
$dbConnection = new PDO(
@@ -204,7 +204,7 @@ $basePath = "/users/cwsvjudo/www";
}
echo("<table>");
echo("<tr><th>Name</th><th>Vorname</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");
echo("<tr><th>Name</th><th>Vorname</th><th>Geb.Dat.</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");
foreach( $starterData as $starter ){
if( empty($starter) ){
@@ -217,6 +217,7 @@ $basePath = "/users/cwsvjudo/www";
$userData = getUserData($mysqli, $starter['userId']);
echo("<td>".mb_convert_encoding($userData['name'], 'UTF-8', 'ISO-8859-1')."</td>");
echo("<td>".mb_convert_encoding($userData['vorname'], 'UTF-8', 'ISO-8859-1')."</td>");
echo("<td>".mb_convert_encoding(date("d.m.Y", strtotime($userData['gebDatum'])), 'UTF-8', 'ISO-8859-1')."</td>");
echo("<td>".$starter['masse']."</td>");
echo("<td>".$starter['platz']."</td>");
echo("<td>".$starter['id']."</td>");
@@ -227,7 +228,7 @@ $basePath = "/users/cwsvjudo/www";
}
}
// $fahrtenData = array();
// $fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']);
$fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']);
?>
<h2>Fahrten:</h2>
<ul>