Merge /media/sdb1/gitRepositories/judo into promoInfo

Conflicts:
	.gitignore
	homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php
	homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php
	homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php
	homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
	homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php
	homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php
	homepage/redesign2018/markdownExperiment/wkParticipo/index.php
	homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php
	homepage/redesign2018/markdownExperiment/wkParticipo/login.php
	homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php
	homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php
This commit is contained in:
marko
2018-09-27 05:20:00 +02:00
362 changed files with 82680 additions and 85 deletions

View File

@@ -1,14 +1,7 @@
<?php
require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc');
$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('./auth.php');
require_once('./lib/wkParticipoLib.php.inc');
require_once('./local/db.php.inc');
require_once('./local/wkParticipoConf.php.inc');
require_once('./lib/wkParticipoLib.inc.php');
if (isset($_SESSION['login'])) {
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php');
} else {
@@ -80,7 +73,7 @@ if (isset($_SESSION['login'])) {
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<body>
<h1>Wettkampf&shy;planung der Judoka des CWSV</h1>
<h1>Wettkampfplanung der Judoka des CWSV</h1>
<?php echo htmlRetMessage($message);?>
<form class="loginForm" action="./login.php" method="post">
<fieldset>