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

- kleinere Änderungen im Wettkampfplaner

Browse Source 
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
This commit is contained in:
marko
2018-07-22 08:08:22 +02:00
parent e6f87bbbbb
commit df47ab598e
30 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php
View File

@@ -2,7 +2,7 @@
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
if(!empty($_POST)){ if(!empty($_POST)){
if( empty($_POST['f']['eventId']) ){ if( empty($_POST['f']['eventId']) ){

2
homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php
View File

@@ -2,7 +2,7 @@
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
// $meldungsBox = array(); // $meldungsBox = array();
$meldungsBox = ""; $meldungsBox = "";

2
homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php
View File

@@ -2,7 +2,7 @@
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
// $meldungsBox = array(); // $meldungsBox = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$message['notice'] = ""; $message['notice'] = "";

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php
View File

@@ -2,7 +2,7 @@
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
if(!empty($_POST)){ if(!empty($_POST)){

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php
View File

@@ -2,7 +2,7 @@
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
// $meldungsBox = array(); // $meldungsBox = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php
View File

@@ -2,7 +2,7 @@
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php
View File

@@ -2,7 +2,7 @@
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$starterInfo = array(); $starterInfo = array();
if(!empty($_POST)){ if(!empty($_POST)){

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php
View File

@@ -4,7 +4,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
// require_once('../auth.php'); // require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
try{ try{
// Verbinding mit der Datenbank herstellen // Verbinding mit der Datenbank herstellen

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php
View File

@@ -2,7 +2,7 @@
require('../local/db.php.inc'); require('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php
View File

@@ -2,7 +2,7 @@
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
if(!empty($_POST)){ if(!empty($_POST)){

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$eventData = array(); $eventData = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$fahrt = array(); $fahrt = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php
View File

@@ -2,7 +2,7 @@
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$eventData = array(); $eventData = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php
View File

@@ -2,7 +2,7 @@
require_once('../auth.php'); require_once('../auth.php');
require_once('../local/db.php.inc'); require_once('../local/db.php.inc');
require_once('../local/wkParticipoConf.php.inc'); require_once('../local/wkParticipoConf.php.inc');
require_once('../lib/wkParticipoLib.php.inc'); require_once('../lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
if(!empty($_POST)){ if(!empty($_POST)){

2
homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
// require_once('./authLogin.php'); // require_once('./authLogin.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
// Daten für den Datenbanklogin laden. // Daten für den Datenbanklogin laden.
//include("$_SERVER[DOCUMENT_ROOT]/bonus/db.inc"); //include("$_SERVER[DOCUMENT_ROOT]/bonus/db.inc");

2
homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php
View File

@@ -2,7 +2,7 @@
require('./local/db.php.inc'); require('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$message = array(); $message = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
View File

@@ -2,7 +2,7 @@
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./authLogin.php'); require_once('./authLogin.php');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$sqlMessage = array(); $sqlMessage = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php
View File

@@ -2,7 +2,7 @@
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

2
homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
// Authentifizierung checken und evtl auf die Loginseite weiterleiten // Authentifizierung checken und evtl auf die Loginseite weiterleiten
require_once('./auth.php'); require_once('./auth.php');

6
homepage/redesign2018/markdownExperiment/wkParticipo/index.php
View File

@@ -2,7 +2,7 @@
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$sqlMessage = array(); $sqlMessage = array();
@@ -82,10 +82,10 @@
?> ?>
<h3><?php echo( mb_convert_encoding($kindDaten['name'].", ".$kindDaten['vorname'].": ", 'UTF-8', 'ISO-8859-1') );?></h3> <h3><?php echo( mb_convert_encoding($kindDaten['name'].", ".$kindDaten['vorname'].": ", 'UTF-8', 'ISO-8859-1') );?></h3>
<?php <?php
$wkEventData = getUsersCommingWkEvents($mysqli, $kindId); $wkEventData = getUsersCommingWkEvents( $mysqli, $kindId, array('outCharset'=>"UTF-8") );
if(empty($wkEventData)){ if(empty($wkEventData)){
?> ?>
<?php echo mb_convert_encoding($kindDaten['name'].", ".$kindDaten['vorname'], 'UTF-8', 'ISO-8859-1');?> ist derzeit bei keinem Wettkampf eingetragen! <?php echo( $kindDaten['name'].", ".$kindDaten['vorname'] );?> ist derzeit bei keinem Wettkampf eingetragen!
<?php <?php
} }
else{ else{

2
homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
// Authentifizierung checken und evtl auf die Loginseite weiterleiten // Authentifizierung checken und evtl auf die Loginseite weiterleiten
require_once('./auth.php'); require_once('./auth.php');

24
homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
View File

@@ -550,7 +550,17 @@ $ret = array();
return $ret; return $ret;
} }
function getUsersCommingWkEvents($anMysqlConn, $anUserId){ function getUsersCommingWkEvents($anMysqlConn, $anUserId, $someOptions=array() ){
// wir befinden uns in der Übergangsphase:
// - als Standard wird das derzeitige Verhalten definiert (ISO-8859-1
// und die Konvertierung erfolgt ausserhalb)
// - wenn einmal alle mbConvertEncoding weg sind, kann der Standard auf
// das gewünschte Verhalten umgestellt werden
if( empty($optionsArray['dbCharset']) ) $optionsArray['dbCharset'] = "ISO-8859-1";
//if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8";// das spätere, gewünschte Verhalten
if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "ISO-8859-1";
$ret = array(); $ret = array();
$anMysqlConn->query("USE cwsvjudo;"); $anMysqlConn->query("USE cwsvjudo;");
$query = sprintf( $query = sprintf(
@@ -579,6 +589,18 @@ $ret = array();
if( !$results ) die("ERR: Fehler bei Datenbankabfrage (".$query.")!\n"); if( !$results ) die("ERR: Fehler bei Datenbankabfrage (".$query.")!\n");
while( $result = $results->fetch_assoc() ) while( $result = $results->fetch_assoc() )
array_push( $ret, $result); 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; return $ret;
} }

2
homepage/redesign2018/markdownExperiment/wkParticipo/login.php
View File

@@ -2,7 +2,7 @@
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
// require_once('./auth.php'); // require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
if (isset($_SESSION['login'])) { if (isset($_SESSION['login'])) {
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php'); header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php');
} else { } else {

2
homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php
View File

@@ -2,7 +2,7 @@
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
// require_once('./auth.php'); // require_once('./auth.php');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
if (isset($_SESSION['login'])) { if (isset($_SESSION['login'])) {
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php'); header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php');
} else { } else {

2
homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
View File

@@ -2,7 +2,7 @@
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./authLogin.php'); require_once('./authLogin.php');
require_once('./local/db.php.inc'); require_once('./local/db.php.inc');
require_once('./lib/wkParticipoLib.php.inc'); require_once('./lib/wkParticipoLib.inc.php');
$message = array(); $message = array();
$eventData = array(); $eventData = array();

2
homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php
View File

@@ -2,7 +2,7 @@
require_once('./local/wkParticipoConf.php.inc'); require_once('./local/wkParticipoConf.php.inc');
require_once('./auth.php'); require_once('./auth.php');
require_once('./local/db.php.inc'); 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); $mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
if($mysqlConn->connect_error){ if($mysqlConn->connect_error){