fix issues with form control 'output as link' for email controls

(cherry picked from commit 0d3e4c8)
exponentcms · Oct 29, 2016 · b49d22b · b49d22b
1 parent bd35998
commit b49d22b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/framework/modules/forms/controllers/formsController.php b/framework/modules/forms/controllers/formsController.php
@@ -103,8 +103,14 @@ public function showall() {
                 if (empty($this->config['column_names_list'])) {
                     //define some default columns...
                     $controls = $fc->find('all', 'forms_id=' . $f->id . ' AND is_readonly=0 AND is_static = 0', 'rank');
-                    foreach (array_slice($controls, 0, 5) as $control) {  // default to only first 5 columns
-                        $this->config['column_names_list'][] = $control->name;
+                    if (!empty($this->params['view']) && $this->params['view'] == 'showall_portfolio') {
+                        foreach ($controls as $control) {  // we need to output all columns for portfolio view
+                            $this->config['column_names_list'][] = $control->name;
+                        }
+                    } else {
+                        foreach (array_slice($controls, 0, 5) as $control) {  // default to only first 5 columns
+                            $this->config['column_names_list'][] = $control->name;
+                        }
                     }
                 }
 

diff --git a/framework/modules/forms/views/forms/email/default_report.tpl b/framework/modules/forms/views/forms/email/default_report.tpl
@@ -40,7 +40,7 @@
                     {$captions.$fieldname}
                 </td>
                 <td>
-                    {if $fieldname|lower == 'email'}
+                    {if $fieldname|lower == 'email' && stripos($value, '<a ') === false}
                         <a href="mailto:{$value}">{$value}</a>
                     {elseif $fieldname|lower == 'image'}
                         {$matches = array()}

diff --git a/framework/modules/forms/views/forms/show.tpl b/framework/modules/forms/views/forms/show.tpl
@@ -74,7 +74,7 @@
                         <tr class="{cycle values="even,odd"}">
                             <td>{$captions.$fieldname}</td>
                             <td>
-                                {if $fieldname|lower == 'email'}
+                                {if $fieldname|lower == 'email' && stripos($value, '<a ') === false}
                                     <a href="mailto:{$value}">{$value}</a>
                                 {elseif $fieldname|lower == 'image'}
                                     {$matches = array()}

diff --git a/framework/modules/forms/views/forms/showall.bootstrap.tpl b/framework/modules/forms/views/forms/showall.bootstrap.tpl
@@ -79,7 +79,7 @@
                         <tr>
                             {foreach $page->columns as $field=>$caption}
                                 <td>
-                                    {if $field|lower == 'email'}
+                                    {if $field|lower == 'email' && stripos($value, '<a ') === false}
                                         <a href="mailto:{$fields.$field}">
                                     {elseif $caption@iteration == 1 && !$config.hide_view}
                                         <a href={link action=show forms_id=$f->id id=$fields.id}>

diff --git a/framework/modules/forms/views/forms/showall.bootstrap3.tpl b/framework/modules/forms/views/forms/showall.bootstrap3.tpl
@@ -79,7 +79,7 @@
                         <tr>
                             {foreach $page->columns as $field=>$caption}
                                 <td>
-                                    {if $field|lower == 'email'}
+                                    {if $field|lower == 'email' && stripos($value, '<a ') === false}
                                         <a href="mailto:{$fields.$field}">
                                     {elseif $caption@iteration == 1 && !$config.hide_view}
                                         <a href={link action=show forms_id=$f->id id=$fields.id}>

diff --git a/framework/modules/forms/views/forms/showall.tpl b/framework/modules/forms/views/forms/showall.tpl
@@ -79,7 +79,7 @@
                         <tr>
                             {foreach $page->columns as $field=>$caption}
                                 <td>
-                                    {if $field|lower == 'email'}
+                                    {if $field|lower == 'email' && stripos($value, '<a ') === false}
                                         <a href="mailto:{$fields.$field}">
                                     {elseif $caption@iteration == 1 && !$config.hide_view}
                                         <a href={link action=show forms_id=$f->id id=$fields.id}>

diff --git a/framework/modules/forms/views/forms/showall_portfolio.tpl b/framework/modules/forms/views/forms/showall_portfolio.tpl
@@ -75,7 +75,7 @@
                                         {$captions.$fieldname}
                                     </td>
                                     <td>
-                                        {if $fieldname|lower == 'email'}
+                                        {if $fieldname|lower == 'email' && stripos($value, '<a ') === false}
                                             <a href="mailto:{$value}">{$value}</a>
                                         {elseif $fieldname|lower == 'image'}
                                             {$matches = array()}