User interface for e-mail {$name}

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1081 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a0a5ecc531fb7db2679402199a8d8e3df8b60b6a..811e25a902a5264de256c0bfdd7b5e05dc083126 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -236,13 +236,15 @@ class Adminer {
        
        /** Print extra text in the end of a select form
        * @param array fields holding e-mails
+       * @param array selectable columns
        * @return null
        */
-       function selectEmailPrint($emailFields) {
+       function selectEmailPrint($emailFields, $columns) {
        }
        
        /** Process columns box in select
        * @param array selectable columns
+       * @param array
        * @return array (array(select_expressions), array(group_expressions))
        */
        function selectColumnsProcess($columns, $indexes) {

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 1da3bd45078613d5449d365c7f805e97efe344e3..482898908e1c843b47323849124992a45470d639 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -286,7 +286,7 @@ if (!$columns) {
                }
                echo "<fieldset><legend>" . lang('CSV Import') . "</legend><div><input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> <input type='submit' name='import' value='" . lang('Import') . "'></div></fieldset>\n";
                
-               $adminer->selectEmailPrint(array_filter($email_fields, 'strlen'));
+               $adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
                
                echo "</form>\n";
        }

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 953cee0475a7d57a8bfb0e69f146b2ae5a6ed7b6..6f1823fb8c68ea1f1ab43e489bfd51aa4268053d 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -21,7 +21,7 @@ class Adminer {
        function loginForm($username) {
                ?>
 <table cellspacing="0">
-<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="server" value="" /><input name="username" value="<?php echo h($username); ?>">
+<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="server" value=""><input name="username" value="<?php echo h($username); ?>">
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
 <?php
@@ -181,14 +181,14 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
                echo "</div></fieldset>\n";
        }
        
-       function selectEmailPrint($emailFields) {
+       function selectEmailPrint($emailFields, $columns) {
                global $confirm;
                if ($emailFields) {
-                       echo '<fieldset><legend><a href="#fieldset-email" onclick="return !toggle(\'fieldset-email\');">' . lang('E-mail') . "</a></legend><div id='fieldset-email' class='hidden'>\n";
-                       echo "<p>" . lang('From') . ": <input name='email_from'>\n";
-                       echo lang('Subject') . ": <input name='email_subject'>\n";
-                       echo "<p><textarea name='email_message' rows='15' cols='60'></textarea>\n";
-                       //! add UI for {$name} fields
+                       echo '<fieldset><legend><a href="#fieldset-email" onclick="return !toggle(\'fieldset-email\');">' . lang('E-mail') . "</a></legend><div id='fieldset-email'" . ($_POST["email_append"] ? "" : " class='hidden'") . ">\n";
+                       echo "<p>" . lang('From') . ": <input name='email_from' value='" . h($_POST["email_from"]) . "'>\n";
+                       echo lang('Subject') . ": <input name='email_subject' value='" . h($_POST["email_subject"]) . "'>\n";
+                       echo "<p><textarea name='email_message' rows='15' cols='60'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n";
+                       echo "<select name='email_addition'>" . optionlist($columns, $_POST["email_addition"]) . "</select> <input type='submit' name='email_append' value='" . lang('Insert') . "'>\n"; //! JavaScript
                        echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : '<select name="email_field">' . optionlist($emailFields) . '</select> ');
                        echo "<input type='submit' name='email' value='" . lang('Send') . "'$confirm>\n";
                        echo "</div></fieldset>\n";
@@ -252,6 +252,9 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
        
        function selectEmailProcess($where, $foreignKeys) {
                global $dbh;
+               if ($_POST["email_append"]) {
+                       return true;
+               }
                if ($_POST["email"]) {
                        $sent = 0;
                        if ($_POST["all"] || $_POST["check"]) {