zotan/c3stream
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add rc3

Browse source
This commit is contained in:
Laura Hausmann 2020-12-28 03:44:05 +01:00
parent 32695eb173
commit 470c9e9934
Signed by: zotan
GPG key ID: 5EC1D38FFC321311
4 changed files with 39 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
.idea/.idea.c3stream/.idea/contentModel.xml
View file

@ -1,30 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.1/extResources" t="IncludeRecursive" />
<e p="$USER_HOME$/Library/Caches/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_c3stream.-879192168.00" t="ExcludeRecursive" />
<e p="$USER_HOME$/.cache/JetBrains/Rider2020.3/extResources" t="IncludeRecursive" />
<e p="$USER_HOME$/.cache/JetBrains/Rider2020.3/resharper-host/local/Transient/Rider/v203/SolutionCaches/_c3stream.-187536235.00" t="ExcludeRecursive" />
<e p="$PROJECT_DIR$" t="IncludeRecursive">
<e p=".gitignore" t="Include" />
<e p="appsettings.Development.json" t="Include" />
<e p="appsettings.json" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="c3stream.cs" t="Include" />
<e p="c3stream.csproj" t="IncludeRecursive" />
<e p="c3stream.sln" t="IncludeFlat" />
<e p="LICENSE" t="Include" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="c3stream.AssemblyInfo.cs" t="Include" />
<e p="c3stream.RazorAssemblyInfo.cs" t="Include" />
</e>
</e>
</e>
<e p="packages" t="ExcludeRecursive" />
<e p="Pages" t="Include">
<e p="_ViewImports.cshtml" t="Include" />
<e p="_ViewStart.cshtml" t="Include" />
<e p="Conference.cshtml" t="Include" />
<e p="Conference.cshtml.cs" t="Include" />
<e p="Error.cshtml" t="Include" />
@ -39,6 +21,8 @@
<e p="_Layout.cshtml" t="Include" />
<e p="_ValidationScriptsPartial.cshtml" t="Include" />
</e>
<e p="_ViewImports.cshtml" t="Include" />
<e p="_ViewStart.cshtml" t="Include" />
</e>
<e p="Properties" t="Include">
<e p="launchSettings.json" t="Include" />
@ -46,6 +30,21 @@
<e p="README.md" t="Include" />
<e p="Startup.cs" t="Include" />
<e p="Types.cs" t="Include" />
<e p="appsettings.Development.json" t="Include" />
<e p="appsettings.json" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="c3stream.cs" t="Include" />
<e p="c3stream.csproj" t="IncludeRecursive" />
<e p="c3stream.sln" t="IncludeFlat" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="c3stream.AssemblyInfo.cs" t="Include" />
<e p="c3stream.RazorAssemblyInfo.cs" t="Include" />
</e>
</e>
</e>
<e p="packages" t="ExcludeRecursive" />
<e p="wwwroot" t="Include">
<e p="css" t="Include">
<e p="fa.css" t="Include" />
@ -57,6 +56,7 @@
</e>
<e p="lib" t="Include">
<e p="bootstrap" t="Include">
<e p="LICENSE" t="Include" />
<e p="dist" t="Include">
<e p="css" t="Include">
<e p="bootstrap-grid.css" t="Include" />
@ -83,29 +83,28 @@
<e p="bootstrap.min.js.map" t="Include" />
</e>
</e>
<e p="LICENSE" t="Include" />
</e>
<e p="jquery" t="Include">
<e p="LICENSE.txt" t="Include" />
<e p="dist" t="Include">
<e p="jquery.js" t="Include" />
<e p="jquery.min.js" t="Include" />
<e p="jquery.min.map" t="Include" />
</e>
<e p="LICENSE.txt" t="Include" />
</e>
<e p="jquery-validation" t="Include">
<e p="LICENSE.md" t="Include" />
<e p="dist" t="Include">
<e p="additional-methods.js" t="Include" />
<e p="additional-methods.min.js" t="Include" />
<e p="jquery.validate.js" t="Include" />
<e p="jquery.validate.min.js" t="Include" />
</e>
<e p="LICENSE.md" t="Include" />
</e>
<e p="jquery-validation-unobtrusive" t="Include">
<e p="LICENSE.txt" t="Include" />
<e p="jquery.validate.unobtrusive.js" t="Include" />
<e p="jquery.validate.unobtrusive.min.js" t="Include" />
<e p="LICENSE.txt" t="Include" />
</e>
</e>
<e p="webfonts" t="Include">

2
.idea/.idea.c3stream/.idea/modules.xml
View file

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.c3stream/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.c3stream/riderModule.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.c3stream/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.c3stream/.idea/riderModule.iml" />
</modules>
</component>
</project>

7
.idea/.idea.c3stream/.idea/riderModule.iml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

16
c3stream.cs
View file

@ -18,7 +18,7 @@ namespace c3stream {
public static string DbPath = Path.Combine(DataPath, DbFile);
public static List<ConferenceObject> Conferences = new List<ConferenceObject> {
new ConferenceObject("divoc", true),
new ConferenceObject("rc3", true),
new ConferenceObject("36c3"),
new ConferenceObject("camp2019"),
new ConferenceObject("35c3"),
@ -79,22 +79,22 @@ namespace c3stream {
}
}
public static void UpdateCookie(HttpRequest resquest, HttpResponse response, string redirectUri) {
public static void UpdateCookie(HttpRequest request, HttpResponse response, string redirectUri) {
//if new bookmark is in uri
if (resquest.Query.ContainsKey("bookmark") && resquest.Cookies["bookmark"] != resquest.Query["bookmark"]) {
response.Cookies.Append("bookmark", resquest.Query["bookmark"], new CookieOptions {Expires = DateTimeOffset.MaxValue});
if (request.Query.ContainsKey("bookmark") && request.Cookies["bookmark"] != request.Query["bookmark"]) {
response.Cookies.Append("bookmark", request.Query["bookmark"], new CookieOptions {Expires = DateTimeOffset.MaxValue});
//disabled for HSTS compliance
//response.Redirect(redirectUri + "bookmark=" + resquest.Query["bookmark"]);
//response.Redirect(redirectUri + "bookmark=" + request.Query["bookmark"]);
}
//if no cookie exists or cookie is invalid
else if (!resquest.Cookies.ContainsKey("bookmark") || !Guid.TryParseExact(resquest.Cookies["bookmark"], "D", out _)) {
else if (!request.Cookies.ContainsKey("bookmark") || !Guid.TryParseExact(request.Cookies["bookmark"], "D", out _)) {
var guid = Guid.NewGuid().ToString();
response.Cookies.Append("bookmark", guid, new CookieOptions {Expires = DateTimeOffset.MaxValue});
response.Redirect(redirectUri + "bookmark=" + guid);
}
//redir to cookie
else if (!resquest.Query.ContainsKey("bookmark")) {
response.Redirect(redirectUri + "bookmark=" + resquest.Cookies["bookmark"]);
else if (!request.Query.ContainsKey("bookmark")) {
response.Redirect(redirectUri + "bookmark=" + request.Cookies["bookmark"]);
}
}