Migration page improved

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-926
+930

IISMainHandler/handlers/response/MigrateAccountHandler.cs

@@ -31,7 +31,7 @@ namespace FLocal.IISHandler.handlers.response {
 			string key = Util.RandomString(8, Util.RandomSource.LETTERS_DIGITS);
 			return new XElement[] {
 				new XElement("migrationInfo",
-					new XElement("accountId", account.id),
+					account.exportToXml(context),
 					new XElement("key", key),
 					new XElement("check", Util.md5(key + " " + Config.instance.SaltMigration + " " + account.id))
 				),

templates/Full/MigrateAccount.xslt

@@ -9,7 +9,8 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ</xsl:text>
+								<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text>
+								<xsl:value-of select="migrationInfo/account/user/name"/>
 							</td> 
 						</tr>
 						<tr class="darktable"> 
@@ -23,7 +24,7 @@
 							<td class="lighttable"> 
 								<form method="post" action="/do/MigrateAccount/">
 									<input type="hidden" name="accountId">
-										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/accountId"/></xsl:attribute>
+										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/account/id"/></xsl:attribute>
 									</input>
 									<input type="hidden" name="check">
 										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute>

templates/Lite/MigrateAccount.xslt

@@ -9,7 +9,8 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ</xsl:text>
+								<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text>
+								<xsl:value-of select="migrationInfo/account/user/name"/>
 							</td> 
 						</tr>
 						<tr class="darktable"> 
@@ -23,7 +24,7 @@
 							<td class="lighttable"> 
 								<form method="post" action="/do/MigrateAccount/">
 									<input type="hidden" name="accountId">
-										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/accountId"/></xsl:attribute>
+										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/account/id"/></xsl:attribute>
 									</input>
 									<input type="hidden" name="check">
 										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute>