URL in email archive and details now displayed

diff --git a/inc/databases.php b/inc/databases.php
index dea7be4ebe64085ba30995a7748c858bed61a62c..b8a723a3a283a2d99b0a2d648eb582137ef3a674 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level

-define('CURR_SVN_REVISION', "422");
+define('CURR_SVN_REVISION', "423");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 4644ae63bcfd0ea92136b484b8460f38515bca61..fb6df1836f02d349a66806578542b676c948dbf1 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -112,7 +112,8 @@ if (SQL_NUMROWS($result) > 0)
                        'unconfirmed' => $unconfirmed,
                        'type'        => TRANSLATE_POOL_TYPE($pool[6]),
                        'tsend'       => $pool[9],
                        'unconfirmed' => $unconfirmed,
                        'type'        => TRANSLATE_POOL_TYPE($pool[6]),
                        'tsend'       => $pool[9],

-                       'url'         => FRAMETESTER($pool[8]),
+                       'frametester' => FRAMETESTER($pool[8]),
+                       'url'         => COMPILE_CODE($pool[8]),

                        'stamp'       => MAKE_DATETIME($pool[7], "0"),
                        'mid'         => $pool[0],
                );
                        'stamp'       => MAKE_DATETIME($pool[7], "0"),
                        'mid'         => $pool[0],
                );

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 7e58510f76c1bf8cdd285758f2edcaa4476e048d..6762cc915fbf0a4b9b06d7c793ff0a38f3ad4954 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -153,6 +153,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                $content['receivers']   = str_replace(";", ", ", $pool['receivers']);
                $content['type']        = TRANSLATE_POOL_TYPE($pool['data_type']);
                $content['frametester'] = FRAMETESTER($pool['url']);
                $content['receivers']   = str_replace(";", ", ", $pool['receivers']);
                $content['type']        = TRANSLATE_POOL_TYPE($pool['data_type']);
                $content['frametester'] = FRAMETESTER($pool['url']);

+               $content['url']         = COMPILE_CODE($pool['url']);

                $content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
 
                // Load row template
                $content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
 
                // Load row template

diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl
index 57e8da621328afe754db4d87739035b4e06105a7..b83324dcc5601b70d384ea1be0dd2877c59a7102 100644 (file)
--- a/templates/de/html/admin/admin_email_archiv_row.tpl
+++ b/templates/de/html/admin/admin_email_archiv_row.tpl
@@ -1,59 +1,81 @@
-<TR>
-       <TD class="switch_sw$content[sw] top2 bottom right" width="23%"
-               align="center">{--EMAIL_SENDER--}:<BR />
-       <STRONG class="admin_misc">$content[u_link]</STRONG></TD>
-       <TD class="switch_sw$content[sw] top2 bottom right" width="23%"
-               align="center">{--EMAIL_SUBJECT--}:<BR />
-       <STRONG class="admin_misc">$content[subj]</STRONG></TD>
-       <TD class="switch_sw$content[sw] top2 bottom" width="54%"
-               align="center">{--EMAIL_TEXT--}:<BR />
-       <STRONG class="admin_misc">$content[text]</STRONG></TD>
-</TR>
-<TR>
-       <TD height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-</TR>
-<TR>
-       <TD colspan="2" align="center"
-               class="switch_sw$content[sw] top bottom right">
-       {--EMAIL_PAYMENT--}:<BR />
-       <STRONG class="admin_misc">$content[pay] </TD>
-       <TD align="center" class="switch_sw$content[sw] top bottom">
-       {--EMAIL_CATEGORY--}:<BR />
-       <STRONG class="admin_misc">$content[cat] </TD>
-</TR>
-<TR>
-       <TD height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-</TR>
-<TR>
-       <TD align="center" class="switch_sw$content[sw] top bottom right">
-       {--EMAIL_RECEIVERS--}:<BR />
-       <STRONG class="admin_misc">$content[sent]</STRONG> ({--EMAIL_RUIDS--}:
-       <STRONG class="admin_misc">$content[ruids]</STRONG>)</TD>
-       <TD align="center" class="switch_sw$content[sw] top bottom right">
-       {--USERS_LINKS--}:<BR />
-       <STRONG class="admin_misc">$content[unconfirmed]</STRONG></TD>
-       <TD align="center" class="switch_sw$content[sw] top bottom">
-       {--EMAIL_POOL_TYPE--}:<BR />
-       <STRONG class="admin_misc">$content[type]</STRONG></TD>
-</TR>
-<TR>
-       <TD height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-</TR>
-<TR>
-       <TD align="center" class="switch_sw$content[sw] top right">
-       {--EMAIL_TSEND--}:<BR />
-       <STRONG class="admin_misc">$content[tsend]</STRONG></TD>
-       <TD align="center" class="switch_sw$content[sw] top right">
-       {--EMAIL_URL--}:<BR />
-       <STRONG class="admin_misc"><A href="$content[url]"
-               target="_blank">{--ADMIN_TEST_URL--}</A></STRONG></TD>
-       <TD align="center" class="switch_sw$content[sw] top">
-       {--EMAIL_TIMESTAMP--}:<BR />
-       <STRONG class="admin_misc">$content[stamp]</STRONG></TD>
-</TR>
-<TR>
-       <TD align="center" class="switch_sw$content[sw] top2 admin_del_link"
-               colspan="3"><A
-               href="{!URL!}/modules.php?module=admin&amp;what=del_email&amp;mid=$content[mid]">{--ADMIN_DELETE_NORMAL_MAIL--}</A>
-       </TD>
-</TR>
+<tr>
+       <td class="switch_sw$content[sw] top2 bottom right" width="23%" align="center">
+               {--EMAIL_SENDER--}:<br />
+               <strong class="admin_misc">$content[u_link]</strong>
+       </td>
+       <td class="switch_sw$content[sw] top2 bottom right" width="23%" align="center">
+               {--EMAIL_SUBJECT--}:<br />
+               <strong class="admin_misc">$content[subj]</strong>
+       </td>
+       <td class="switch_sw$content[sw] top2 bottom" width="54%" align="center">
+               {--EMAIL_TEXT--}:<br />
+               <strong class="admin_misc">$content[text]</strong>
+       </td>
+</tr>
+<tr>
+       <td height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</td>
+</tr>
+<tr>
+       <td colspan="2" align="center" class="switch_sw$content[sw] top bottom right">
+               {--EMAIL_PAYMENT--}:<br />
+               <strong class="admin_misc">$content[pay]</strong>
+       </td>
+       <td align="center" class="switch_sw$content[sw] top bottom">
+               {--EMAIL_CATEGORY--}:<br />
+               <strong class="admin_misc">$content[cat]</strong>
+       </td>
+</tr>
+<tr>
+       <td height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</td>
+</tr>
+<tr>
+       <td align="center" class="switch_sw$content[sw] top bottom right">
+               {--EMAIL_RECEIVERS--}:<br />
+               <strong class="admin_misc">$content[sent]</strong> ({--EMAIL_RUIDS--}:
+               <strong class="admin_misc">$content[ruids]</strong>)
+       </td>
+       <td align="center" class="switch_sw$content[sw] top bottom right">
+               {--USERS_LINKS--}:<br />
+               <strong class="admin_misc">$content[unconfirmed]</strong>
+       </td>
+       <td align="center" class="switch_sw$content[sw] top bottom">
+               {--EMAIL_POOL_TYPE--}:<br />
+               <strong class="admin_misc">$content[type]</strong>
+       </td>
+</tr>
+<tr>
+       <td height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</td>
+</tr>
+<tr>
+       <td align="center" class="switch_sw$content[sw] top bottom right">
+               {--EMAIL_TSEND--}:<br />
+               <strong class="admin_misc">$content[tsend]</strong>
+       </td>
+       <td align="center" class="switch_sw$content[sw] top bottom right">
+               {--EMAIL_URL--}:<br />
+               <strong class="admin_misc"><a href="$content[frametester]"
+                       target="_blank">{--ADMIN_TEST_URL--}</a></strong>
+       </td>
+       <td align="center" class="switch_sw$content[sw] top bottom">
+               {--EMAIL_TIMESTAMP--}:<br />
+               <strong class="admin_misc">$content[stamp]</strong>
+       </td>
+</tr>
+<tr>
+       <td height="5" colspan="3" class="switch_sw$content[sw] seperator">&nbsp;</td>
+</tr>
+<tr>
+       <td align="center" class="switch_sw$content[sw] top right" colspan="2">
+               {--EMAIL_URL--}:<br />
+               <strong class="admin_misc">$content[url]</strong>
+       </td>
+       <td align="center" class="switch_sw$content[sw] top">
+               {--__UNUSED--}:<br />
+               <strong class="admin_misc">---</strong>
+       </td>
+</tr>
+<tr>
+       <td align="center" class="switch_sw$content[sw] top2 admin_del_link" colspan="3">
+               <a href="{!URL!}/modules.php?module=admin&amp;what=del_email&amp;mid=$content[mid]">{--ADMIN_DELETE_NORMAL_MAIL--}</a>
+       </td>
+</tr>

diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl
index 6cd9ceaeeb3dd9e20a18303462720fea41392605..ce38dccf1c7bb9bd977b88557d303909a30f9923 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl
+++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl
@@ -1,61 +1,72 @@
-<TR>
-  <TD class="bottom top2 right" colspan="2" width="46%" align="center">
+<tr>
+  <td class="bottom top2 right" colspan="2" width="46%" align="center">

     {--EMAIL_SUBJECT--}:<br />
     {--EMAIL_SUBJECT--}:<br />

-    <STRONG class="admin_misc">$content[subject]</STRONG>
-  </TD>
-  <TD class="bottom top2" width="54%" align="center">
+    <strong class="admin_misc">$content[subject]</strong>
+  </td>
+  <td class="bottom top2" width="54%" align="center">

     {--EMAIL_TEXT--}:<br />
     {--EMAIL_TEXT--}:<br />

-    <STRONG class="admin_misc">$content[text]</STRONG>
-  </TD>
-</TR>
-<TR><TD height="5" colspan="3"></TD></TR>
-<TR>
-  <TD align="center" class="top bottom right" width="23%">
+    <strong class="admin_misc">$content[text]</strong>
+  </td>
+</tr>
+<tr><td height="5" colspan="3" class="seperator">&nbsp;</td></tr>
+<tr>
+  <td align="center" class="top bottom right" width="23%">

     {--EMAIL_POINTS--}:<br />
     {--EMAIL_POINTS--}:<br />

-    <STRONG class="admin_misc">$content[points] {--POINTS--}
-  </TD>
-  <TD align="center" class="top bottom right" width="23%">
+    <strong class="admin_misc">$content[points] {!POINTS!}</strong>
+  </td>
+  <td align="center" class="top bottom right" width="23%">

     {--EMAIL_SECONDS--}:<br />
     {--EMAIL_SECONDS--}:<br />

-    <STRONG class="admin_misc">$content[time]
-  </TD>
-  <TD align="center" class="top bottom">
+    <strong class="admin_misc">$content[time]</strong>
+  </td>
+  <td align="center" class="top bottom">

     {--EMAIL_CATEGORY--}:<br />
     {--EMAIL_CATEGORY--}:<br />

-    <STRONG class="admin_misc">$content[category]
-  </TD>
-</TR>
-<TR><TD height="5" colspan="3"></TD></TR>
-<TR>
-  <TD align="center" class="top bottom right">
+    <strong class="admin_misc">$content[category]</strong>
+  </td>
+</tr>
+<tr><td height="5" colspan="3" class="seperator">&nbsp;</td></tr>
+<tr>
+  <td align="center" class="top bottom right">

     {--EMAIL_RECEIVERS--}:<br />
     {--EMAIL_RECEIVERS--}:<br />

-    <STRONG class="admin_misc">$content[mails_sent]</STRONG>
-    ({--EMAIL_RUIDS--}: <STRONG class="admin_misc">$content[receivers]</STRONG>)
-  </TD>
-  <TD align="center" class="top bottom right">
+    <strong class="admin_misc">$content[mails_sent]</strong>
+    ({--EMAIL_RUIDS--}: <strong class="admin_misc">$content[receivers]</strong>)
+  </td>
+  <td align="center" class="top bottom right">

     {--USERS_LINKS--}:<br />
     {--USERS_LINKS--}:<br />

-    <STRONG class="admin_misc">$content[unconfirmed]</STRONG>
-  </TD>
-  <TD align="center" class="top bottom">
+    <strong class="admin_misc">$content[unconfirmed]</strong>
+  </td>
+  <td align="center" class="top bottom">

     {--EMAIL_POOL_TYPE--}:<br />
     {--EMAIL_POOL_TYPE--}:<br />

-    <STRONG class="admin_misc">$content[type]</STRONG>
-  </TD>
-</TR>
-<TR><TD height="5" colspan="3"></TD></TR>
-<TR>
-  <TD align="center" class="top right">
+    <strong class="admin_misc">$content[type]</strong>
+  </td>
+</tr>
+<tr><td height="5" colspan="3" class="seperator">&nbsp;</td></tr>
+<tr>
+  <td align="center" class="top bottom right">

     {--EMAIL_TSEND--}:<br />
     {--EMAIL_TSEND--}:<br />

-    <STRONG class="admin_misc">$content[target_send]</STRONG>
-  </TD>
-  <TD align="center" class="top right">
+    <strong class="admin_misc">$content[target_send]</strong>
+  </td>
+  <td align="center" class="top bottom right">

     {--EMAIL_URL--}:<br />
     {--EMAIL_URL--}:<br />

-    <STRONG class="admin_misc"><A href="$content[frametester]" target="_blank">{--ADMIN_TEST_URL--}</A></STRONG>
-  </TD>
-  <TD align="center" class="top">
+    <strong class="admin_misc"><a href="$content[frametester]" target="_blank">{--ADMIN_TEST_URL--}</a></strong>
+  </td>
+  <td align="center" class="top bottom">

     {--EMAIL_TIMESTAMP--}:<br />
     {--EMAIL_TIMESTAMP--}:<br />

-    <STRONG class="admin_misc">$content[timestamp]</STRONG>
-  </TD>
-</TR>
-<TR>
-  <TD align="center" class="top2 admin_del_link" colspan="3">
-    <A href="{--URL--}/modules.php?module=admin&amp;what=del_email&amp;bid=$content[id]">{--ADMIN_DELETE_BONUS_MAIL--}</A>
-  </TD>
-</TR>
+    <strong class="admin_misc">$content[timestamp]</strong>
+  </td>
+</tr>
+<tr><td height="5" colspan="3" class="seperator">&nbsp;</td></tr>
+<tr>
+  <td align="center" class="top right" colspan="2">
+    {--EMAIL_URL--}:<br />
+    <strong class="admin_misc">$content[url]</strong>
+  </td>
+  <td align="center" class="top">
+    {--__UNUSED--}:<br />
+    <strong class="admin_misc">---</strong>
+  </td>
+</tr>
+<tr>
+  <td align="center" class="top2 admin_del_link" colspan="3">
+    <a href="{--URL--}/modules.php?module=admin&amp;what=del_email&amp;bid=$content[id]">{--ADMIN_DELETE_BONUS_MAIL--}</a>
+  </td>
+</tr>