diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php index ec8f622..e89e127 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php @@ -23,7 +23,7 @@ global $cwsvJudoConfig; // Datenbankverbindung bereit stellen try{ $db_connection = new PDO( - 'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"], + 'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"],//.';charset=utf8', $cwsvJudoConfig["db"]["user"], $cwsvJudoConfig["db"]["password"] ); @@ -161,4 +161,46 @@ function toAscii($str, $replace=array(), $delimiter='-') { return $clean; } + +function dbQuery($aDbConnection, $aQueryString, $aBindArray = array(), $someOptions = array( "dbCharset" => "ISO-8859-1", "outCharset" => "UTF-8" ) ){ +//echo("Doing ".$aQueryString); +var_dump($aBindArray); +if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1"; +if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8"; +/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss +/// doch auch die Eingabe konvertiert werden. Aber das jetzt +/// umzustellen wird schwer! Die User m Wettkampfplaner sind ja z.B. +/// als UTF8 in latin1(?) gespeichert. + try{ + $pdoStatement = $aDbConnection->prepare( $aQueryString ); + foreach( $aBindArray as $bindName => $bind ){ + $pdoStatement->bindValue( + $bindName, + $bind['value'], + (isset($bind['data_type'])?$bind['data_type']:PDO::PARAM_STR) + ); + } + $pdoStatement->execute(); + $ret = $pdoStatement->fetchAll(PDO::FETCH_ASSOC); + } + catch(PDOException $db_error){ + print "Error!: " . $db_error->getMessage() . ""; + return null; + } + //var_dump($ret); +// Zeichensatzkonvertierung + if( is_array($ret) ){ + foreach($ret as &$entry){ + array_walk( + $entry, + function (&$value, $key, $someOptions) { + $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value); + }, + $someOptions + ); + } + } +return $ret; +} + ?> diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index 4a9e3be..52bbbf9 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -200,7 +200,7 @@ $htmlWkTableString = ""; str_replace("mannschaft", "mannschaft", $wk['Veranstaltung']); $htmlWkTableString .= - "". + "". "". "". "". diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php index de4df97..30a6ff1 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php @@ -3,7 +3,7 @@ require_once('../local/wkParticipoConf.php.inc'); $message = array(); if(!empty($_POST)){ - if( empty($_POST['f']['wkId']) || empty($_POST['f']['meldefrist']) ){ + if( empty($_POST['f']['wkId']) || empty($_POST['f']['meldefrist']) || empty($_POST['f']['datum']) ){ $message['error'] = 'Es wurden nicht alle Felder ausgefüllt.'; } else{ @@ -12,12 +12,13 @@ $message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error; } $query = sprintf( - "INSERT INTO wkParticipo_Events (wkId, meldefrist) - SELECT * FROM (SELECT '%s', '%s') as new_event + "INSERT INTO wkParticipo_Events (wkId, datum, meldefrist) + SELECT * FROM (SELECT '%s', '%s', '%s') as new_event WHERE NOT EXISTS ( SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s' ) LIMIT 1;", $mysqli->real_escape_string($_POST['f']['wkId']), + $mysqli->real_escape_string($_POST['f']['datum']), $mysqli->real_escape_string($_POST['f']['meldefrist']), $mysqli->real_escape_string($_POST['f']['wkId']) ); @@ -55,6 +56,7 @@ Benutzerdaten wkId /> + datum /> meldefrist /> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php index 70c161f..708d233 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php @@ -10,6 +10,7 @@ $message['wkData'] = ""; $eventWkId = isset($_POST['f']['wkId']) ? $_POST['f']['wkId'] : ""; + $eventMeldefrist = isset($_POST['f']['date']) ? $_POST['f']['date'] : ""; $eventMeldefrist = isset($_POST['f']['meldefrist']) ? $_POST['f']['meldefrist'] : ""; // echo $_POST['f']['wkId']; echo $eventWkId; echo $eventMeldefrist; die(); @@ -38,7 +39,7 @@ if(!empty($_POST)){ // print_r($_POST); - if( empty($_POST['f']['wkId']) || empty($_POST['f']['meldefrist']) ){ + if( empty($_POST['f']['wkId']) || empty($_POST['f']['date']) || empty($_POST['f']['meldefrist']) ){ // echo $_POST['f']['wkId']." aber ".$_POST['f']['meldefrist']; $message['notice'] .= "Alle Felder ausfüllen und abschicken!"; // print_r($message); @@ -67,6 +68,7 @@ "". ""; // $message['notice'] .= "eventWkDatum: ".$eventWkResult['Datum'].""; + $date=$eventWkResult['Datum']; $meldefrist = date( "Y-m-d", strtotime( @@ -93,12 +95,13 @@ } else{ $query = sprintf( - "INSERT INTO wkParticipo_Events (wkId, meldefrist) - SELECT * FROM (SELECT '%s', '%s') as new_event + "INSERT INTO wkParticipo_Events (wkId, date, meldefrist) + SELECT * FROM (SELECT '%s', '%s', '%s') as new_event WHERE NOT EXISTS ( SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s' ) LIMIT 1;", $mysqli->real_escape_string($_POST['f']['wkId']), + $mysqli->real_escape_string($_POST['f']['date']), $mysqli->real_escape_string($_POST['f']['meldefrist']), $mysqli->real_escape_string($_POST['f']['wkId']) ); @@ -148,6 +151,10 @@ Eventdaten wkId /> + + date + /> + meldefrist /> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php index 97e68c5..4a55cca 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php @@ -1,4 +1,11 @@ connect_error) { $sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error; @@ -33,7 +39,30 @@ } } } - else $message['error'] = "Fehler: eventId ist kein Int (".$_POST['f']['eventId'].")"; + + //var_dump($_POST); + if( $_POST['action'] == "deleteStarter" ){ + try{ + $dbConnection = new PDO( + 'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"], + $cwsvJudoConfig["db"]["user"], + $cwsvJudoConfig["db"]["password"] + ); + if($_POST['action']=="deleteStarter"){ + echo("DELETE FROM `wkParticipo_Starter` WHERE id=:starterId;"); + $deleteStarterQuery = $dbConnection->prepare( + "DELETE FROM `wkParticipo_Starter` WHERE id=:starterId;" + ); + $deleteStarterQuery->bindParam(':starterId', $_POST['starterId'], PDO::PARAM_INT); + if($deleteStarterQuery->execute()); + else echo("FEHLER\n"); + } + } + catch(PDOException $db_error){ + die( "Error!: " . $db_error->getMessage() ); + } + } + else echo("NoActionDeleteStarter\n"); } } ?> @@ -132,6 +161,9 @@ type: fahrtId: + Austragen + + "ISO-8859-1", "outCharset" => "UTF-8" ) ){ -//echo("Doing ".$aQueryString); -var_dump($aBindArray); -if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1"; -if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8"; -/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss -/// doch auch die Eingabe konvertiert werden. Aber das jetzt -/// umzustellen wird schwer! Die User m Wettkampfplaner sind ja z.B. -/// als UTF8 in latin1(?) gespeichert. - try{ - $pdoStatement = $aDbConnection->prepare( $aQueryString ); - foreach( $aBindArray as $bindName => $bind ){ - $pdoStatement->bindValue( - $bindName, - $bind['value'], - (isset($bind['data_type'])?$bind['data_type']:PDO::PARAM_STR) - ); - } - $pdoStatement->execute(); - $ret = $pdoStatement->fetchAll(PDO::FETCH_ASSOC); - } - catch(PDOException $db_error){ - print "Error!: " . $db_error->getMessage() . ""; - return null; - } - //var_dump($ret); -// Zeichensatzkonvertierung - if( is_array($ret) ){ - foreach($ret as &$entry){ - array_walk( - $entry, - function (&$value, $key, $someOptions) { - $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value); - }, - $someOptions - ); - } - } -return $ret; -} - function array2htmlTableString($anArray){ $ret = ""; if( !is_array($anArray) )