Migration page improved

main
Inga 🏳‍🌈 14 years ago
parent 0eaeaea909
commit aa2a9a51e4
  1. 2
      Builder/IISMainHandler/build.txt
  2. 2
      IISMainHandler/handlers/response/MigrateAccountHandler.cs
  3. 3
      templates/Full/MigrateAccount.xslt
  4. 3
      templates/Lite/MigrateAccount.xslt

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

@ -10,6 +10,7 @@
<tr> <tr>
<td class="tdheader"> <td class="tdheader">
<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text> <xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text>
<xsl:value-of select="migrationInfo/account/user/name"/>
</td> </td>
</tr> </tr>
<tr class="darktable"> <tr class="darktable">
@ -23,7 +24,7 @@
<td class="lighttable"> <td class="lighttable">
<form method="post" action="/do/MigrateAccount/"> <form method="post" action="/do/MigrateAccount/">
<input type="hidden" name="accountId"> <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>
<input type="hidden" name="check"> <input type="hidden" name="check">
<xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute> <xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute>

@ -10,6 +10,7 @@
<tr> <tr>
<td class="tdheader"> <td class="tdheader">
<xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text> <xsl:text>Ìèãðàöèÿ ïîëüçîâàòåëÿ </xsl:text>
<xsl:value-of select="migrationInfo/account/user/name"/>
</td> </td>
</tr> </tr>
<tr class="darktable"> <tr class="darktable">
@ -23,7 +24,7 @@
<td class="lighttable"> <td class="lighttable">
<form method="post" action="/do/MigrateAccount/"> <form method="post" action="/do/MigrateAccount/">
<input type="hidden" name="accountId"> <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>
<input type="hidden" name="check"> <input type="hidden" name="check">
<xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute> <xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute>

Loading…
Cancel
Save