From df47ab598e9cb8bbfb457ef786f8e9e24fcc6933 Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 22 Jul 2018 08:08:22 +0200 Subject: [PATCH] =?UTF-8?q?-=20kleinere=20=C3=84nderungen=20im=20Wettkampf?= =?UTF-8?q?planer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit geändert: addFahrt.php geändert: addStarter.php geändert: addStarterDev.php geändert: admin/addEvent.php geändert: admin/addMitfahrer.php geändert: admin/adminAddStarter.php geändert: admin/adminFunctions.php geändert: admin/adminUpdateStarterErgebnis.php geändert: admin/index.php geändert: admin/listEvents.php geändert: admin/listUsers.php geändert: admin/newsLetter.php geändert: admin/resetPassword.php geändert: admin/reseteMitfahrer.php geändert: admin/showEvent.php geändert: admin/showFahrt.php geändert: admin/showUser.php geändert: admin/verteileMitfahrer.php geändert: calendar.php geändert: changePassword.php geändert: eventKalender.php geändert: galImgPicker.php geändert: horstWolfJudosport.php geändert: index.php geändert: infoZettel.php geändert: lib/wkParticipoLib.inc.php geändert: login.php geändert: loginDev.php geändert: showWkEvent.php geändert: userInfo.php --- .../wkParticipo/addFahrt.php | 2 +- .../wkParticipo/addStarter.php | 2 +- .../wkParticipo/addStarterDev.php | 2 +- .../wkParticipo/admin/addEvent.php | 2 +- .../wkParticipo/admin/addMitfahrer.php | 2 +- .../wkParticipo/admin/adminAddStarter.php | 2 +- .../wkParticipo/admin/adminFunctions.php | 2 +- .../admin/adminUpdateStarterErgebnis.php | 2 +- .../wkParticipo/admin/index.php | 2 +- .../wkParticipo/admin/listEvents.php | 2 +- .../wkParticipo/admin/listUsers.php | 2 +- .../wkParticipo/admin/newsLetter.php | 2 +- .../wkParticipo/admin/resetPassword.php | 2 +- .../wkParticipo/admin/reseteMitfahrer.php | 2 +- .../wkParticipo/admin/showEvent.php | 2 +- .../wkParticipo/admin/showFahrt.php | 2 +- .../wkParticipo/admin/showUser.php | 2 +- .../wkParticipo/admin/verteileMitfahrer.php | 2 +- .../wkParticipo/calendar.php | 2 +- .../wkParticipo/changePassword.php | 2 +- .../wkParticipo/eventKalender.php | 2 +- .../wkParticipo/galImgPicker.php | 2 +- .../wkParticipo/horstWolfJudosport.php | 2 +- .../markdownExperiment/wkParticipo/index.php | 6 ++--- .../wkParticipo/infoZettel.php | 2 +- .../wkParticipo/lib/wkParticipoLib.inc.php | 24 ++++++++++++++++++- .../markdownExperiment/wkParticipo/login.php | 2 +- .../wkParticipo/loginDev.php | 2 +- .../wkParticipo/showWkEvent.php | 2 +- .../wkParticipo/userInfo.php | 2 +- 30 files changed, 54 insertions(+), 32 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php b/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php index 320aa9e..95429b1 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php @@ -2,7 +2,7 @@ require_once('./local/db.php.inc'); require_once('./local/wkParticipoConf.php.inc'); require_once('./auth.php'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); $message = array(); if(!empty($_POST)){ if( empty($_POST['f']['eventId']) ){ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php b/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php index 234c325..7201661 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php @@ -2,7 +2,7 @@ require_once('./local/db.php.inc'); require_once('./local/wkParticipoConf.php.inc'); require_once('./auth.php'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); $message = array(); // $meldungsBox = array(); $meldungsBox = ""; diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php b/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php index fc23bc2..4eba386 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php @@ -2,7 +2,7 @@ require_once('./local/db.php.inc'); require_once('./local/wkParticipoConf.php.inc'); require_once('./auth.php'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); $message = array(); // $meldungsBox = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php index 1ce8fd8..70c161f 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php @@ -1,7 +1,7 @@ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php index ef84106..07460b5 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php @@ -2,7 +2,7 @@ require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); ?> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php index ba7fb3f..5c616e5 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php @@ -2,7 +2,7 @@ require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); ?> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php index d9e0aed..52adfdf 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php @@ -4,7 +4,7 @@ require_once('../local/wkParticipoConf.php.inc'); // require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); try{ // Verbinding mit der Datenbank herstellen diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php index 08a43a6..16f7877 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php @@ -2,7 +2,7 @@ require('../local/db.php.inc'); require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php index e97219c..bd6fb06 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php @@ -2,7 +2,7 @@ require_once('../auth.php'); require_once('../local/db.php.inc'); require_once('../local/wkParticipoConf.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); if(!empty($_POST)){ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php index 74de603..150a3c2 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php @@ -2,7 +2,7 @@ require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); $eventData = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php index 0f888a8..8b13169 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php @@ -2,7 +2,7 @@ require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); $fahrt = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php index 764d41e..2f856ab 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php @@ -2,7 +2,7 @@ require_once('../local/wkParticipoConf.php.inc'); require_once('../auth.php'); require_once('../local/db.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); $eventData = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php index c65f1ff..3b82337 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php @@ -2,7 +2,7 @@ require_once('../auth.php'); require_once('../local/db.php.inc'); require_once('../local/wkParticipoConf.php.inc'); - require_once('../lib/wkParticipoLib.php.inc'); + require_once('../lib/wkParticipoLib.inc.php'); $message = array(); if(!empty($_POST)){ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php b/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php index 3162abe..1eef7c2 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php @@ -1,7 +1,7 @@ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php b/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php index fdf5f39..eca1a25 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php @@ -1,7 +1,7 @@

"UTF-8") ); if(empty($wkEventData)){ ?> - ist derzeit bei keinem Wettkampf eingetragen! + ist derzeit bei keinem Wettkampf eingetragen! query("USE cwsvjudo;"); $query = sprintf( @@ -579,6 +589,18 @@ $ret = array(); if( !$results ) die("ERR: Fehler bei Datenbankabfrage (".$query.")!\n"); while( $result = $results->fetch_assoc() ) array_push( $ret, $result); + +// Zeichensatzkonvertierung + foreach($ret as &$entry){ + array_walk( + $entry, + function (&$value, $key, $optionsArray) { + $value = iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $value); + }, + $optionsArray + ); + } + return $ret; } diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/login.php b/homepage/redesign2018/markdownExperiment/wkParticipo/login.php index 6a8c5a2..9f77d38 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/login.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/login.php @@ -2,7 +2,7 @@ require_once('./local/db.php.inc'); require_once('./local/wkParticipoConf.php.inc'); // require_once('./auth.php'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); if (isset($_SESSION['login'])) { header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php'); } else { diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php b/homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php index b046386..0c1430e 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php @@ -2,7 +2,7 @@ require_once('./local/db.php.inc'); require_once('./local/wkParticipoConf.php.inc'); // require_once('./auth.php'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); if (isset($_SESSION['login'])) { header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php'); } else { diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php index 4042c58..46d7653 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php @@ -2,7 +2,7 @@ require_once('./local/wkParticipoConf.php.inc'); require_once('./authLogin.php'); require_once('./local/db.php.inc'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); $message = array(); $eventData = array(); diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php b/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php index 5346a39..b313fd4 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php @@ -2,7 +2,7 @@ require_once('./local/wkParticipoConf.php.inc'); require_once('./auth.php'); require_once('./local/db.php.inc'); - require_once('./lib/wkParticipoLib.php.inc'); + require_once('./lib/wkParticipoLib.inc.php'); $mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name); if($mysqlConn->connect_error){