Changes

z1tr0t3c · Jan 9, 2021 · f0e42e3 · f0e42e3
1 parent 8295961
commit f0e42e3
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 29 deletions.
diff --git a/blista.xcodeproj/project.pbxproj b/blista.xcodeproj/project.pbxproj
@@ -584,7 +584,7 @@
 				CODE_SIGN_ENTITLEMENTS = blista/blista.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = CM9ECSAB4Y;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -595,7 +595,7 @@
 				INFOPLIST_FILE = blista/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.17.0;
+				MARKETING_VERSION = 1.18.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -615,7 +615,7 @@
 				CODE_SIGN_ENTITLEMENTS = blista/blista.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = CM9ECSAB4Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -625,7 +625,7 @@
 				INFOPLIST_FILE = blista/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.17.0;
+				MARKETING_VERSION = 1.18.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/blista/EighteenthViewController.swift b/blista/EighteenthViewController.swift
@@ -29,15 +29,15 @@ class EighteenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "ankündigen",
                                    customAttributes: [:])
 
-            webView18.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
+            webView18.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "Ankündigen",
                                    contentType: "Ankündigen",
                                    contentId: "ankündigen",
                                    customAttributes: [:])
 
-            webView18.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
+            webView18.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()
@@ -65,15 +65,15 @@ class EighteenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "ankündigen",
                                    customAttributes: [:])
 
-            webView18.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
+            webView18.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "Ankündigen",
                                    contentType: "Ankündigen",
                                    contentId: "ankündigen",
                                    customAttributes: [:])
 
-            webView18.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
+            webView18.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/forum/search.php?id=3&words&phrase&notwords&fullwords&timefromrestrict=1&fromday=1&frommonth=1&fromyear=2000&fromhour=0&fromminute=0&hfromday=0&hfrommonth=0&hfromyear=0&hfromhour=0&hfromminute=0&htoday=1&htomonth=1&htoyear=1&htohour=1&htominute=1&forumid&subject&user#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()

diff --git a/blista/FirstViewController.swift b/blista/FirstViewController.swift
@@ -52,7 +52,7 @@ class FirstViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan1",
                                    customAttributes: [:])
 
-            webView1.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=39#maincontent")!))
+            webView1.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=39#maincontent")!))
 
         case .cellular:
 
@@ -61,7 +61,7 @@ class FirstViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan1",
                                    customAttributes: [:])
 
-            webView1.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=39#maincontent")!))
+            webView1.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=39#maincontent")!))
 
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
@@ -86,7 +86,7 @@ class FirstViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan1vorschau",
                                    customAttributes: [:])
 
-            webView1.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=43#maincontent")!))
+            webView1.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=43#maincontent")!))
 
         case .cellular:
 
@@ -95,7 +95,7 @@ class FirstViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan1vorschau",
                                    customAttributes: [:])
 
-            webView1.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=43#maincontent")!))
+            webView1.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=43#maincontent")!))
 
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false

diff --git a/blista/NineteenthViewController.swift b/blista/NineteenthViewController.swift
@@ -29,15 +29,15 @@ class NineteenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "raumbuchungen",
                                    customAttributes: [:])
 
-            webView19.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/blocks/mrbs/web/index.php#maincontent")!))
+            webView19.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/blocks/mrbs/web/index.php#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "Raumbuchungen",
                                    contentType: "Raumbuchungen",
                                    contentId: "raumbuchungen",
                                    customAttributes: [:])
 
-            webView19.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/blocks/mrbs/web/index.php#maincontent")!))
+            webView19.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/blocks/mrbs/web/index.php#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()
@@ -65,15 +65,15 @@ class NineteenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "raumbuchungen",
                                    customAttributes: [:])
 
-            webView19.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/blocks/mrbs/web/index.php#maincontent")!))
+            webView19.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/blocks/mrbs/web/index.php#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "Raumbuchungen",
                                    contentType: "Raumbuchungen",
                                    contentId: "raumbuchungen",
                                    customAttributes: [:])
 
-            webView19.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/blocks/mrbs/web/index.php#maincontent")!))
+            webView19.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/blocks/mrbs/web/index.php#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()

diff --git a/blista/SecondViewController.swift b/blista/SecondViewController.swift
@@ -50,7 +50,7 @@ class SecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan2",
                                    customAttributes: [:])
 
-            webView2.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=41#maincontent")!))
+            webView2.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=41#maincontent")!))
 
         case .cellular:
 
@@ -59,7 +59,7 @@ class SecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan2",
                                    customAttributes: [:])
 
-            webView2.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=41#maincontent")!))
+            webView2.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=41#maincontent")!))
 
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
@@ -84,7 +84,7 @@ class SecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan2vorschau",
                                    customAttributes: [:])
 
-            webView2.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=45#maincontent")!))
+            webView2.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=45#maincontent")!))
 
         case .cellular:
 
@@ -93,7 +93,7 @@ class SecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "vplan2vorschau",
                                    customAttributes: [:])
 
-            webView2.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/mod/resource/view.php?id=45#maincontent")!))
+            webView2.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/mod/resource/view.php?id=45#maincontent")!))
 
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false

diff --git a/blista/TenthViewController.swift b/blista/TenthViewController.swift
@@ -29,15 +29,15 @@ class TenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "newsletter",
                                    customAttributes: [:])
 
-            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/newsletter#page-content")!))
+            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/ihr-weg-zu-uns#Ko")!))
         case .cellular:
 
             Answers.logContentView(withName: "Newsletter",
                                    contentType: "Newsletter",
                                    contentId: "newsletter",
                                    customAttributes: [:])
 
-            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/newsletter#page-content")!))
+            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/ihr-weg-zu-uns#Ko")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()
@@ -64,15 +64,15 @@ class TenthViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "newsletter",
                                    customAttributes: [:])
 
-            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/newsletter#page-content")!))
+            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/ihr-weg-zu-uns#Ko")!))
         case .cellular:
 
             Answers.logContentView(withName: "Newsletter",
                                    contentType: "Newsletter",
                                    contentId: "newsletter",
                                    customAttributes: [:])
 
-            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/newsletter#page-content")!))
+            webView10.loadRequest(URLRequest(url: URL(string: "https://www.blista.de/ihr-weg-zu-uns#Ko")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()

diff --git a/blista/TwentysecondViewController.swift b/blista/TwentysecondViewController.swift
@@ -30,15 +30,15 @@ class TwentysecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "educal",
                                    customAttributes: [:])
 
-            webView22.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/calendar/view.php?view=upcoming#maincontent")!))
+            webView22.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/calendar/view.php?view=upcoming#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "EDU-Kalender",
                                    contentType: "EDU-Kalender",
                                    contentId: "educal",
                                    customAttributes: [:])
 
-            webView22.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/calendar/view.php?view=upcoming#maincontent")!))
+            webView22.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/calendar/view.php?view=upcoming#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()
@@ -65,15 +65,15 @@ class TwentysecondViewController: UIViewController, UIWebViewDelegate {
                                    contentId: "educal",
                                    customAttributes: [:])
 
-            webView22.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/calendar/view.php?view=upcoming#maincontent")!))
+            webView22.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/calendar/view.php?view=upcoming#maincontent")!))
         case .cellular:
 
             Answers.logContentView(withName: "EDU-Kalender",
                                    contentType: "EDU-Kalender",
                                    contentId: "educal",
                                    customAttributes: [:])
 
-            webView22.loadRequest(URLRequest(url: URL(string: "https://edu.blista.de/moodle/calendar/view.php?view=upcoming#maincontent")!))
+            webView22.loadRequest(URLRequest(url: URL(string: "https://css.moodle.blista.study/calendar/view.php?view=upcoming#maincontent")!))
         case .none:
             UIApplication.shared.isNetworkActivityIndicatorVisible = false
             activity.stopAnimating()

diff --git a/faq.html b/faq.html
@@ -18,7 +18,7 @@ <h1>FAQ</h1>
 A: Dies liegt daran, dass zur Anmeldung sog. Session-Cookies eingesetzt werden, welche nach einem Neustart der blistar-App gelöscht werden. Dies ist zwar etwas nervig, erhöht jedoch für den Katalog die Sicherheit.<br><br>
 Du kannst deine Zugangsdaten für EDU und auch für den Online-Katalog aber abspeichern und so automatisch ausfüllen lassen.<br>
 Tippe unter Einstellungen --> Passwörter & Accounts --> Website- & App-Passwörter auf Hinzufügen.<br>
-Gib nun im Feld Website https://edu.blista.de oder https://katalog.blista.de ein.<br>
+Gib nun im Feld Website https://css.moodle.blista.study oder https://katalog.blista.de ein.<br>
 Gib jetzt deinen Benutzernamen und dein Passwort in die entsprechenden Felder ein und tippe auf Fertig.<br>
 Öffne nun die blistar-App.<br>
 Jetzt sollte wenn du in das Feld Anmeldename tippst, die zusätzliche Taste Passwörter angezeigt werden.<br>

diff --git a/links.html b/links.html
@@ -28,6 +28,11 @@ <h1>Weiterführende Links</h1>
 <br>
 <br>
 
+<a href="https://www.instagram.com/blistacampus" style="color:#00A61D;">Zum Instagram-Account der blista</a>
+
+<br>
+<br>
+
 <a href="http://medibus.info" style="color:#00A61D;">Zur Homepage von Medibus</a>
 
 <br>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,11 @@ <h1>Weiterführende Links</h1> @@
     <br>
     <br>
+    <a href="https://www.instagram.com/blistacampus" style="color:#00A61D;">Zum Instagram-Account der blista</a>
+    <br>
+    <br>
     <a href="http://medibus.info" style="color:#00A61D;">Zur Homepage von Medibus</a>
     <br>
@@ Expand Down @@