From 386367490d9c77419c3bce89cee2864118ba2f42 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 22 Oct 2012 19:37:12 +0000
Subject: [PATCH] WARNING: id is very generic, it has been now renamed to
 booking_id, please fix your table layout

---
 inc/extensions/ext-booking.php                     | 2 +-
 templates/de/html/admin/admin_list_booking.tpl     | 2 +-
 templates/de/html/admin/admin_list_booking_row.tpl | 2 +-
 templates/de/html/ext/ext_booking.tpl              | 8 +++++---
 templates/xml/admin/admin_delete_do_booking.xml    | 2 +-
 templates/xml/admin/admin_list_booking.xml         | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
index c31b3ced8e..50cfdf6254 100644
--- a/inc/extensions/ext-booking.php
+++ b/inc/extensions/ext-booking.php
@@ -56,7 +56,7 @@ switch (getExtensionMode()) {
 		// Drop/create table for user bookings
 		addDropTableSql('user_booking');
 		addCreateTableSql('user_booking', "
-`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`booking_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `subject` VARCHAR(255) NOT NULL DEFAULT 'missing',
 `points_mode` ENUM('ADD','SUB') NOT NULL DEFAULT 'ADD',
diff --git a/templates/de/html/admin/admin_list_booking.tpl b/templates/de/html/admin/admin_list_booking.tpl
index 79774d102a..838f346702 100644
--- a/templates/de/html/admin/admin_list_booking.tpl
+++ b/templates/de/html/admin/admin_list_booking.tpl
@@ -32,7 +32,7 @@
 $content
 <tr>
 	<td colspan="7" class="table_footer" align="center">
-		<input type="hidden" name="id[0]" value="1" />
+		<input type="hidden" name="booking_id[0]" value="1" />
 		<input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
 		<input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_ACTION_DELETE_BOOKING_SUBMIT--}" />
 	</td>
diff --git a/templates/de/html/admin/admin_list_booking_row.tpl b/templates/de/html/admin/admin_list_booking_row.tpl
index 2a2f0d2765..2d693dc82e 100644
--- a/templates/de/html/admin/admin_list_booking_row.tpl
+++ b/templates/de/html/admin/admin_list_booking_row.tpl
@@ -1,6 +1,6 @@
 <tr>
 	<td align="center" class="bottom right {%template,ColorSwitch%}">
-		<strong>$content[id]</strong>
+		<strong>$content[booking_id]</strong>
 	</td>
 	<td align="center" class="bottom right {%template,ColorSwitch%}">
 		{%pipe,translatePointsSubject=$content[subject]%}
diff --git a/templates/de/html/ext/ext_booking.tpl b/templates/de/html/ext/ext_booking.tpl
index 102f289994..2b67af4539 100644
--- a/templates/de/html/ext/ext_booking.tpl
+++ b/templates/de/html/ext/ext_booking.tpl
@@ -1,3 +1,5 @@
-Ein Kontoauszug aller Auf- und Abbuchungen, die Ihre Mitglieder erhalten haben.
-Sie k&ouml;nnen den Bereinigungsinterval f&uuml;r veraltete Eintr&auml;ge, sowie
-die Anzahl Eintr&auml;ge pro Seite einstellen.
+<div class="para">
+	Ein Kontoauszug aller Auf- und Abbuchungen, die Ihre Mitglieder erhalten
+	haben. Sie k&ouml;nnen den Bereinigungsinterval f&uuml;r veraltete
+	Eintr&auml;ge, sowie die Anzahl Eintr&auml;ge pro Seite einstellen.
+</div>
diff --git a/templates/xml/admin/admin_delete_do_booking.xml b/templates/xml/admin/admin_delete_do_booking.xml
index 07a62058e4..38c6ca7d24 100644
--- a/templates/xml/admin/admin_delete_do_booking.xml
+++ b/templates/xml/admin/admin_delete_do_booking.xml
@@ -60,7 +60,7 @@ MA  02110-1301  USA
 	The table column which should be taken for the ids (see first parameter).
 	This' type can again only be 'string' (remember why?).
 	//-->
-	<table-id-column name="" type="string" value="id" />
+	<table-id-column name="" type="string" value="booking_id" />
 	<!--
 	The table column which should be taken for user ids
 	This' type can again only be 'string' (remember why?).
diff --git a/templates/xml/admin/admin_list_booking.xml b/templates/xml/admin/admin_list_booking.xml
index e754b13aa2..f4fb7b70b0 100644
--- a/templates/xml/admin/admin_list_booking.xml
+++ b/templates/xml/admin/admin_list_booking.xml
@@ -64,7 +64,7 @@ MA  02110-1301  USA
 			always be set), alias (again can be left empty) and SQL function
 			(can also be left empty) which shall be applied on the column.
 			//-->
-			<select-data-from-list-entry type="string" table="" value="id" alias="" function="" />
+			<select-data-from-list-entry type="string" table="" value="booking_id" alias="" function="" />
 			<select-data-from-list-entry type="string" table="" value="userid" alias="" function="" />
 			<select-data-from-list-entry type="string" table="" value="subject" alias="" function="" />
 			<select-data-from-list-entry type="string" table="" value="points_mode" alias="" function="" />
-- 
2.39.2