From 370f96aa996eb7ebb39b6c2cbedc0507a91eded2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 8 Sep 2012 16:30:44 +0200
Subject: [PATCH] Update install & update instructions for 2.0.1

---
 contrib/de.xml                                |  4 +-
 contrib/subsilver2.xml                        |  4 +-
 contrib/update_200_to_201/contrib/de.xml      | 10 ++--
 .../update_200_to_201/contrib/subsilver2.xml  | 12 +---
 contrib/update_200_to_201/update.xml          | 45 ++++++--------
 install.xml                                   | 60 ++++++++++++++++++-
 6 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/contrib/de.xml b/contrib/de.xml
index f12d7452..037f34f5 100644
--- a/contrib/de.xml
+++ b/contrib/de.xml
@@ -86,12 +86,12 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 			 </author>
 		</author-group>
 
-		<mod-version>2.0.0</mod-version>
+		<mod-version>2.0.1</mod-version>
 
 		<installation>
 			<level>easy</level>
 			<time>120</time>
-			<target-version>3.0.10</target-version>
+			<target-version>3.0.11</target-version>
 		</installation>
 
 		<link-group>
diff --git a/contrib/subsilver2.xml b/contrib/subsilver2.xml
index 0bfb118b..d965fc98 100644
--- a/contrib/subsilver2.xml
+++ b/contrib/subsilver2.xml
@@ -86,12 +86,12 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 			 </author>
 		</author-group>
 
-		<mod-version>2.0.0</mod-version>
+		<mod-version>2.0.1</mod-version>
 
 		<installation>
 			<level>easy</level>
 			<time>120</time>
-			<target-version>3.0.10</target-version>
+			<target-version>3.0.11</target-version>
 		</installation>
 
 		<link-group>
diff --git a/contrib/update_200_to_201/contrib/de.xml b/contrib/update_200_to_201/contrib/de.xml
index 25c7c903..c1261457 100644
--- a/contrib/update_200_to_201/contrib/de.xml
+++ b/contrib/update_200_to_201/contrib/de.xml
@@ -86,12 +86,12 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 			 </author>
 		</author-group>
 
-		<mod-version>2.0.0</mod-version>
+		<mod-version>2.0.1</mod-version>
 
 		<installation>
 			<level>easy</level>
 			<time>120</time>
-			<target-version>3.0.10</target-version>
+			<target-version>3.0.11</target-version>
 		</installation>
 
 		<link-group>
@@ -100,13 +100,11 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 		</link-group>
 	</header>
 	<action-group>
-	<!--
 		<copy>
 			<file from="root/language/de/mods/info_acp_portal.php" to="language/de/mods/info_acp_portal.php" />
-			<file from="root/language/de/mods/portal/portal_attachments_module.php" to="language/de/mods/portal/portal_attachments_module.php" />
-			<file from="root/language/de/mods/portal/portal_latest_bots_module.php" to="language/de/mods/portal/portal_latest_bots_module.php" />
+			<file from="root/language/de/mods/portal/portal_links_module.php" to="language/de/mods/portal/portal_links_module.php" />
+			<file from="root/language/de/mods/portal/portal_main_menu_module.php" to="language/de/mods/portal/portal_main_menu_module.php" />
 		</copy>
-		-->
 		<diy-instructions lang="en">See general install.xml file</diy-instructions>
 		<diy-instructions lang="de">Siehe install.xml</diy-instructions>
 	</action-group>
diff --git a/contrib/update_200_to_201/contrib/subsilver2.xml b/contrib/update_200_to_201/contrib/subsilver2.xml
index c9473916..63da65d6 100644
--- a/contrib/update_200_to_201/contrib/subsilver2.xml
+++ b/contrib/update_200_to_201/contrib/subsilver2.xml
@@ -100,19 +100,9 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 		</link-group>	
 	</header>
 	<action-group>
-	<!--
 		<copy>
-			<file from="root/styles/subsilver2/template/portal/modules/*.*" to="styles/subsilver2/template/portal/modules/*.*" />
-			<file from="root/styles/subsilver2/template/portal/portal_body.html" to="styles/subsilver2/template/portal/portal_body.html" />
-			<file from="root/styles/subsilver2/theme/portal.css" to="styles/subsilver2/theme/portal.css" />
-			<file from="root/styles/subsilver2/theme/images/portal/arrowbullet.gif" to="styles/subsilver2/theme/images/portal/arrowbullet.gif" />
-			<file from="root/styles/subsilver2/theme/images/portal/arrowbullet_rtl.gif" to="styles/subsilver2/theme/images/portal/arrowbullet_rtl.gif" />
+			<file from="root/styles/subsilver2/template/portal/modules/user_menu_side.html" to="styles/subsilver2/template/portal/modules/user_menu_side.html" />
 		</copy>
-		<delete>
-			<file name="styles/subsilver2/template/portal/modules/announcements.html" />
-			<file name="styles/subsilver2/template/portal/modules/announcements_compact.html" />
-		</delete>
-	-->
 		<diy-instructions lang="de"><![CDATA[
 Aktualisiere deine Styles:
     "Administrations-Bereich" (ACP) > "Styles" > "Templates" > jedes > "Aktualisieren"
diff --git a/contrib/update_200_to_201/update.xml b/contrib/update_200_to_201/update.xml
index f0cac4a8..3acda98a 100644
--- a/contrib/update_200_to_201/update.xml
+++ b/contrib/update_200_to_201/update.xml
@@ -5,8 +5,8 @@
 	<header>
 		<license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
 
-		<title lang="en">board3 Portal 2.0.1 - Update from Board3 Portal 2.0.1</title>
-		<title lang="de">board3 Portal 2.0.1 - Update von Board3 Portal 2.0.1</title>
+		<title lang="en">board3 Portal 2.0.1 - Update from Board3 Portal 2.0.0</title>
+		<title lang="de">board3 Portal 2.0.1 - Update von Board3 Portal 2.0.0</title>
 
 		<description lang="en">Adds a portal to your forum.
 It has several boxes wich can be turned on an off in the ACP and certain settings.
@@ -103,37 +103,30 @@ Weitere Sprachen kannst in unseren International Forum finden: http://www.board3
 		</link-group>	
 	</header>
 	<action-group>
-	<!--
 		<copy>
-			<file from="root/portal.php" to="portal.php" />
-			<file from="root/adm/style/portal/*.*" to="adm/style/portal/*.*" />
-			<file from="root/includes/acp/*.*" to="includes/acp/*.*" />
-			<file from="root/includes/trim_message/*.*" to="includes/trim_message/*.*" />
+			<file from="root/includes/acp/acp_portal.php" to="includes/acp/acp_portal.php" />
+			<file from="root/includes/trim_message/bbcodes.php" to="includes/trim_message/bbcodes.php" />
 			<file from="root/install/index.php" to="install/index.php" />
 			<file from="root/language/en/mods/info_acp_portal.php" to="language/en/mods/info_acp_portal.php" />
-			<file from="root/language/en/mods/portal/portal_attachments_module.php" to="language/en/mods/portal/portal_attachments_module.php" />
-			<file from="root/language/en/mods/portal/portal_latest_bots_module.php" to="language/en/mods/portal/portal_latest_bots_module.php" />
+			<file from="root/language/en/mods/portal/portal_links_module.php" to="language/en/mods/portal/portal_links_module.php" />
+			<file from="root/language/en/mods/portal/portal_main_menu_module.php" to="language/en/mods/portal/portal_main_menu_module.php" />
 			<file from="root/portal/includes/functions.php" to="portal/includes/functions.php" />
+			<file from="root/portal/includes/functions_modules.php" to="portal/includes/functions_modules.php" />
+			<file from="root/portal/includes/functions_upload.php" to="portal/includes/functions_upload.php" />
 			<file from="root/portal/modules/portal_announcements.php" to="portal/modules/portal_announcements.php" />
+			<file from="root/portal/modules/portal_attachments.php" to="portal/modules/portal_attachments.php" />
 			<file from="root/portal/modules/portal_calendar.php" to="portal/modules/portal_calendar.php" />
-			<file from="root/portal/modules/portal_custom.php" to="portal/modules/portal_custom.php" />
-			<file from="root/portal/modules/portal_donation.php" to="portal/modules/portal_donation.php" />
-			<file from="root/portal/modules/portal_latest_bots.php" to="portal/modules/portal_latest_bots.php" />
-			<file from="root/portal/modules/portal_leaders.php" to="portal/modules/portal_leaders.php" />
-			<file from="root/portal/modules/portal_poll.php" to="portal/modules/portal_poll.php" />
-			<file from="root/portal/modules/portal_whois_online.php" to="portal/modules/portal_whois_online.php" />
-			<file from="root/styles/prosilver/template/portal/modules/*.*" to="styles/prosilver/template/portal/modules/*.*" />
-			<file from="root/styles/prosilver/template/portal/portal_body.html" to="styles/prosilver/template/portal/portal_body.html" />
-			<file from="root/styles/prosilver/theme/portal.css" to="styles/prosilver/theme/portal.css" />
-			<file from="root/styles/prosilver/theme/images/portal/arrowbullet.gif" to="styles/prosilver/theme/images/portal/arrowbullet.gif" />
-			<file from="root/styles/prosilver/theme/images/portal/arrowbullet_rtl.gif" to="styles/prosilver/theme/images/portal/arrowbullet_rtl.gif" />
+			<file from="root/portal/modules/portal_links.php" to="portal/modules/portal_links.php" />
+			<file from="root/portal/modules/portal_main_menu.php" to="portal/modules/portal_main_menu.php" />
+			<file from="root/portal/modules/portal_recent.php" to="portal/modules/portal_recent.php" />
+			<file from="root/styles/prosilver/template/portal/modules/announcements_center.html" to="styles/prosilver/template/portal/modules/announcements_center.html" />
+			<file from="root/styles/prosilver/template/portal/modules/announcements_center_compact.html" to="styles/prosilver/template/portal/modules/announcements_center_compact.html" />
+			<file from="root/styles/prosilver/template/portal/modules/calendar_side.html" to="styles/prosilver/template/portal/modules/calendar_side.html" />
+			<file from="root/styles/prosilver/template/portal/modules/news_center.html" to="styles/prosilver/template/portal/modules/news_center.html" />
+			<file from="root/styles/prosilver/template/portal/modules/news_compact_center.html" to="styles/prosilver/template/portal/modules/news_compact_center.html" />
+			<file from="root/styles/prosilver/template/portal/modules/poll_center.html" to="styles/prosilver/template/portal/modules/poll_center.html" />
+			<file from="root/styles/prosilver/template/portal/modules/poll_side.html" to="styles/prosilver/template/portal/modules/poll_side.html" />
 		</copy>
-		<delete>
-			<file name="portal/includes/trim_message/*.*" />
-			<file name="styles/prosilver/template/portal/modules/announcements.html" />
-			<file name="styles/prosilver/template/portal/modules/announcements_compact.html" />
-		</delete>
-		-->
 		<open src="includes/session.php">
 			<edit>
 				<find><![CDATA[		if (!empty($_GET['style']) && !defined('ADMIN_START') && $this->data['user_type'] != USER_IGNORE)]]></find>
diff --git a/install.xml b/install.xml
index 9cd41286..294e35d6 100644
--- a/install.xml
+++ b/install.xml
@@ -101,10 +101,66 @@ Weitere Sprachen kannst in unserem Internationalen Forum finden: http://www.boar
 			<link type="language" lang="de" href="contrib/de.xml">Anleitung für das deutsche Sprachpaket</link>
 			<link type="template" lang="en" href="contrib/subsilver2.xml">Manual for subsilver2</link>
 			<link type="template" lang="de" href="contrib/subsilver2.xml">Anleitung für subsilver2</link>
-			<link type="contrib" lang="en" href="contrib/update_200_to_201/update.xml">Manual for Updating B3P 2.0.0b1 to 2.0.0</link>
-			<link type="contrib" lang="de" href="contrib/update_200_to_201/update.xml">Anleitung für das Aktualisieren von B3P 2.0.0b1 zu 2.0.0</link>
+			<link type="contrib" lang="en" href="contrib/update_200_to_201/update.xml">Manual for Updating B3P 2.0.0 to 2.0.1</link>
+			<link type="contrib" lang="de" href="contrib/update_200_to_201/update.xml">Anleitung für das Aktualisieren von B3P 2.0.0 zu 2.0.1</link>
 		</link-group>
 		<history>
+			<entry>
+				<date>2012-08-26</date>
+				<rev-version>2.0.1</rev-version>
+				<changelog lang="en">
+					<change>Redirect to portal.php when detecting incorrect announcement parameter</change>
+					<change>Add rel="nofollow" to calendar navigation</change>
+					<change>Fixed incorrect handling of months by strtotime</change>
+					<change>Fix previous commit for calendar</change>
+					<change>Fix incorrect config_name in portal_recent.php</change>
+					<change>Fix error if server-side topic marking is disabled</change>
+					<change>Fix incorrect space between blocks in IE9</change>
+					<change>[ticket/203] Future all day events are always displayed as current</change>
+					<change>[ticket/207] Debug warning in ACP when using PHP 5.4</change>
+					<change>[ticket/206] Missing link to MCP in subsilver2</change>
+					<change>Fix PHP notice when unable to rename</change>
+					<change>Fix incorrect space above calendar in IE9</change>
+					<change>Properly handle mutated vowels in links</change>
+					<change>Enable stylechanger for guests again</change>
+					<change>Add missing language var for logs after removing a link</change>
+					<change>Remove converter for Board3 Portal 1.0.6</change>
+					<change>Fix: Infinite loop caused by smiley code with "["</change>
+					<change>Fix: Only variables can be passed by ref in strict mode</change>
+					<change>Display events that start in the next 24 Hours as "Current"</change>
+					<change>Remove unnecessary variables from format_birthday() &amp; clean-up</change>
+					<change>Save module settings even if module image can't be found</change>
+					<change>Add missing error messages to links &amp; main menu modules</change>
+					<change>Remove update instructions for old releases</change>
+					<change>Remove update for beta version</change>
+				</changelog>
+				<changelog lang="de">
+					<change>Leite bei falschen Parametern für Ankündigungen an die portal.php weiter</change>
+					<change>Füge rel="nofollow" zur Kalender Navigation hinzu</change>
+					<change>Korrigiere fehlerhafte Behandlung von Monaten mit strtotime</change>
+					<change>Korrigiere vohergehende Änderung für den Kalender</change>
+					<change>Korrigiere falschen config_name in portal_recent.php</change>
+					<change>Korrigiere Fehler falls serverseitiges Markieren von Themen deaktiviert ist</change>
+					<change>Korrigiere falschen Abstand zwischen Blöcken in IE9</change>
+					<change>[ticket/203] Future all day events are always displayed as current</change>
+					<change>[ticket/207] PHP 5.4.0 Unterstützung / Support</change>
+					<change>[ticket/206] Kein Link zum Moderations-Bereich im user_menu_side.html bei subsilver2</change>
+					<change>Korrigiere PHP notice falls nicht umbenannt werden kann</change>
+					<change>Korrigiere falschen Abstand über dem Kalender in IE9</change>
+					<change>Gehe korrekt mit Umlauten in Links um</change>
+					<change>Aktiviere Stylechanger wieder für Gäste</change>
+					<change>Füge fehlende Sprachvariablen für Logs nach dem Entfernen von Links hinzu</change>
+					<change>Entferne Konverter für Board3 Portal 1.0.6</change>
+					<change>Korrigiere Endlosschleife durch Smiley Code mit "["</change>
+					<change>Korrigiere: Only variables can be passed by ref in strict mode</change>
+					<change>Zeige Veranstaltungen die in den nächsten 24 Stunden beginnen als aktuell an</change>
+					<change>Entferne unnötige Variablen von format_birthday() &amp; räume etwas auf</change>
+					<change>Sichere Modul Einstellungen auch wenn die Modul Bilder nicht gefunden werden können</change>
+					<change>Füge fehlende Fehlermeldungen zu Links &amp; Menü Modulen hinzu</change>
+					<change>Entferne Update Anleitungen für ältere Veröffentlichungen</change>
+					<change>Entferne Update Anleitung für Beta Version</change>
+				</changelog>
+			</entry>
 			<entry>
 				<date>2012-04-06</date>
 				<rev-version>2.0.0</rev-version>