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

Changes to be committed:

Browse Source 
- hotfix für einzelansicht der news
	modified:   htaccess/cwsvjudo.bplaced.net/.htaccess
	new file:   htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14
- Hilfssfunktion für saubere Url
	modified:   phpLib/cwsvJudo/miscAssis.php
- news jetzt mit struturierten daten (article)
	modified:   phpLib/cwsvJudo/newsLib.php
	modified:   phpLib/cwsvJudo/newsTableHtml.php
- kleinere korrekturen und erweiterungen:
	modified:   phpLib/cwsvJudo/wkKalender.php
	modified:   src/css/cwsvJudo-2018-layout.css
	modified:   src/md/news.md
	modified:   src/md/verein.md
	modified:   wkParticipo/admin/newsLetter.php
	modified:   wkParticipo/showWkEvent.php
This commit is contained in:
marko
2018-08-14 11:33:26 +02:00
parent b57ce57fe1
commit 851213165b
11 changed files with 200 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,8 @@
"cwsvjudo.wettkampfkalender.Altersklassen, ".
"cwsvjudo.wkParticipo_Events.id, ".
"cwsvjudo.wkParticipo_Events.meldefrist, ".
"cwsvjudo.wkParticipo_Events.wkId ".
"cwsvjudo.wkParticipo_Events.wkId, ".
"cwsvjudo.wkParticipo_Events.bemerkungen ".
"FROM cwsvjudo.wettkampfkalender JOIN cwsvjudo.wkParticipo_Events ".
"ON cwsvjudo.wettkampfkalender.lfdeNr = cwsvjudo.wkParticipo_Events.wkId ".
"WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) ".
@@ -42,7 +43,8 @@
"cwsvjudo.wettkampfkalender.Altersklassen, ".
"cwsvjudo.wkParticipo_Events.id, ".
"cwsvjudo.wkParticipo_Events.meldefrist, ".
"cwsvjudo.wkParticipo_Events.wkId ".
"cwsvjudo.wkParticipo_Events.wkId, ".
"cwsvjudo.wkParticipo_Events.bemerkungen ".
"FROM cwsvjudo.wettkampfkalender JOIN cwsvjudo.wkParticipo_Events ".
"ON cwsvjudo.wettkampfkalender.lfdeNr = cwsvjudo.wkParticipo_Events.wkId ".
// "WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) ".
@@ -85,6 +87,8 @@
$newsletter['message'] .= "\tAltersklassen: ".mb_convert_encoding($event['Altersklassen'], 'UTF-8', 'ISO-8859-1')."\r\n";
$newsletter['message'] .= "\tMeldefrist: ".mb_convert_encoding($event['meldefrist'], 'UTF-8', 'ISO-8859-1')."\r\n";
$newsletter['message'] .= "\tLink: http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/showWkEvent.php?eventId=".$event['id']."\r\n";
if(!empty($event['bemerkungen']))
$newsletter['message'] .= "\tBemerkungen: ".$event['bemerkungen']."\r\n";
$newsletter['message'] .= "\t\r\n";
}
@@ -98,6 +102,8 @@
$newsletter['message'] .= "\tAltersklassen: ".mb_convert_encoding($event['Altersklassen'], 'UTF-8', 'ISO-8859-1')."\r\n";
$newsletter['message'] .= "\tMeldefrist: ".mb_convert_encoding($event['meldefrist'], 'UTF-8', 'ISO-8859-1')."\r\n";
$newsletter['message'] .= "\tLink: http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/showWkEvent.php?eventId=".$event['id']."\r\n";
if(!empty($event['bemerkungen']))
$newsletter['message'] .= "\tBemerkungen: ".$event['bemerkungen']."\r\n";
$newsletter['message'] .= "\t\r\n";
}