Merge branch 'master' of git.c3d2.de:c3d2-web
This commit is contained in:
Benjamin Kellermann
commit
a8aef96ba8
|
|
@ -1929,4 +1929,19 @@
|
|||
<start>2014-05-15T20:00:00</start>
|
||||
<location>GCHQ, Lingnerallee 3, Dresden</location>
|
||||
</event>
|
||||
<event title="Privacy Dresden #4">
|
||||
<start>2014-04-10T19:00:00</start>
|
||||
<location>GCHQ, Lingnerallee 3, Dresden</location>
|
||||
<link>https://privacydresden.noblogs.org/post/2014/04/02/4-vernetzungstreffen/</link>
|
||||
</event>
|
||||
<event title="Datenbanken Rundumschlag">
|
||||
<start>2014-04-08T19:00:00</start>
|
||||
<location>SLUB</location>
|
||||
<link>http://wdcmdresden.com/wdcm-april-2014/</link>
|
||||
</event>
|
||||
<event title="Linux-Install-Party">
|
||||
<start>2014-04-09T18:30:00</start>
|
||||
<location>Informatik-Fakultät, TU Dresden</location>
|
||||
<link>https://www.ifsr.de/fsr:news:linux-install-party</link>
|
||||
</event>
|
||||
</calendar>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<item title="Open Data Meetup" date="2014-04-04T21:15:00" author="tranquillo">
|
||||
<image title="Open Data">opendata4x.png</image>
|
||||
|
||||
<event>
|
||||
<start>2014-04-08T19:00:00</start>
|
||||
<end>2014-04-08T21:00:00</end>
|
||||
<location><link href="space.html">GCHQ</link>, Lingnerallee 3</location>
|
||||
</event>
|
||||
|
||||
<p>
|
||||
Das nächste Treffen zum Thema OpenDataDresden und zur Gründung
|
||||
eines OpenKnowledge Labs Dresden findet am Dienstag, den 08.04. in
|
||||
den Räumen des C3D2 statt. Wir laden daher alle Interessierten ein
|
||||
dabei zu sein.
|
||||
</p>
|
||||
<p>
|
||||
Los gehts ab 19Uhr. Ab 18Uhr werden die Räume jedoch auch schon
|
||||
besetzt sein. Im Anschluss, formloser Übergang zu freien
|
||||
Hacktätigkeiten. Getränke gibt es vor Ort.
|
||||
</p>
|
||||
<p>
|
||||
Themen werden sein:
|
||||
</p>
|
||||
<ul>
|
||||
<li>NewsRoundup</li>
|
||||
<li>OK-Lab Gründung</li>
|
||||
<li>Kommunikationskanal</li>
|
||||
<li>NetSession / AllRis Scraper (via. openRuhr.de)</li>
|
||||
<li>…dein Thema</li>
|
||||
</ul>
|
||||
</item>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<item title='6. Dresdner OWASP Stammtisch' date='2014-04-05T21:00:00' author='_john'>
|
||||
<image title='OWASP'>owasp_logo_250x250.png</image>
|
||||
<event>
|
||||
<start>2014-04-09T19:00:00</start>
|
||||
<end>2014-04-09T22:00:00</end>
|
||||
<location><link href="space.html">GCHQ</link>, Lingnerallee 3</location>
|
||||
</event>
|
||||
|
||||
<p>
|
||||
Das Thema dieses ist eine Fortsetzung des 4. Treffens wo es um
|
||||
Buffer Overflows ging. _john wird anhand von Codebeispielen zeigen,
|
||||
warum der Angriff von Ben bei x86 Progammen funktioniert hat und
|
||||
warum auf x86_64 nicht.
|
||||
Außerdem werden wir sehen warum blindes Verwenden unsauberer
|
||||
Eingabedaten trotzdem fatal sein kann.
|
||||
</p>
|
||||
<p>
|
||||
Mehr Infos gibt zur Dresdner OWASP Initiative gibt es <link href="https://www.owasp.org/index.php/OWASP_German_Chapter_Stammtisch_Initiative/Dresden">im OWASP Wiki</link>.
|
||||
</p>
|
||||
</item>
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<xsl:variable name="newsfile" select="."/>
|
||||
<xsl:if test="(position() <= $maxitems) and
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
|
||||
starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
|
||||
starts-with(date:difference(date:date-time(), concat(document(.)/item/@date, '+02:00')), '-')">
|
||||
<xsl:for-each select="document($newsfile)/item">
|
||||
<xsl:call-template name="atom-entry">
|
||||
<xsl:with-param name="newsfile" select="$newsfile"/>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<!-- Events aus den News ziehen -->
|
||||
<xsl:for-each select="document('../news.xml')/page/news/newsfile">
|
||||
<xsl:variable name="news" select="document(concat('../', .))"/>
|
||||
<xsl:if test="starts-with(date:difference(date:date-time(), $news/item/@date), '-')">
|
||||
<xsl:if test="starts-with(date:difference(date:date-time(), concat($news/item/@date, '+02:00')), '-')">
|
||||
<xsl:apply-templates select="$news/item/event">
|
||||
<xsl:with-param name="link" select="concat(substring-before(substring-after(., 'content/'), '.xml'), '.html')"/>
|
||||
</xsl:apply-templates>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<!-- Extract from news -->
|
||||
<xsl:for-each select="document('../news.xml')//newsfile">
|
||||
<xsl:variable name="news" select="document(concat('../', .))"/>
|
||||
<xsl:if test="starts-with(date:difference(date:date-time(), $news/item/@date), '-')">
|
||||
<xsl:if test="starts-with(date:difference(date:date-time(), concat($news/item/@date, '+02:00')), '-')">
|
||||
<xsl:apply-templates select="$news/item"
|
||||
mode="news">
|
||||
<xsl:with-param name="link"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<xsl:variable name="newsfile" select="."/>
|
||||
<xsl:if test="(position() <= $maxitems) and
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
|
||||
starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
|
||||
starts-with(date:difference(date:date-time(), concat(document(.)/item/@date, '+02:00')), '-')">
|
||||
<xsl:apply-templates select="document(.)/item">
|
||||
<xsl:with-param name="newsfile" select="$newsfile"/>
|
||||
</xsl:apply-templates>
|
||||
|
|
|
|||
|
|
@ -135,19 +135,20 @@
|
|||
|
||||
<xsl:for-each select="newsfile">
|
||||
<xsl:sort select="date:seconds(document(concat('../', .))/item/@date)" data-type="number" order="descending" />
|
||||
<xsl:variable name="news" select="document(concat('../', .))"/>
|
||||
<xsl:if test="position() <= 10 and
|
||||
not(starts-with(
|
||||
starts-with(
|
||||
date:difference(
|
||||
document(concat('../', .))/item/@date,
|
||||
date:date-time()
|
||||
date:date-time(),
|
||||
concat($news/item/@date, '+02:00')
|
||||
),
|
||||
'-'
|
||||
))">
|
||||
)">
|
||||
|
||||
<xsl:variable name="newsfile"><xsl:value-of select="."/></xsl:variable>
|
||||
<xsl:variable name="itemposition" select="position()"/>
|
||||
|
||||
<xsl:for-each select="document(concat('../', $newsfile))/item">
|
||||
<xsl:for-each select="$news/item">
|
||||
|
||||
<article><div>
|
||||
<xsl:if test="event">
|
||||
|
|
@ -257,16 +258,17 @@
|
|||
<xsl:for-each select="document('../news.xml')/page/news/newsfile">
|
||||
<xsl:sort select="date:seconds(document(concat('../', .))/item/@date)" data-type="number" order="descending" />
|
||||
<xsl:variable name="newsfile" select="."/>
|
||||
<xsl:variable name="news" select="document(concat('../', $newsfile))"/>
|
||||
|
||||
<xsl:for-each select="document(concat('../', $newsfile))/item">
|
||||
<xsl:for-each select="$news/item">
|
||||
<xsl:if test="((string-length($prefix) = 0) or
|
||||
starts-with($newsfile, concat('content/news/', $prefix))) and
|
||||
(($details != 'resources-only') or
|
||||
(count(resource) > 0)) and
|
||||
starts-with(
|
||||
date:difference(
|
||||
document(concat('../', .))/item/@date,
|
||||
date:date-time()
|
||||
date:date-time(),
|
||||
concat($news/item/@date, '+02:00')
|
||||
),
|
||||
'-'
|
||||
)">
|
||||
|
|
|
|||
Loading…
Reference in New Issue