Rename selectExtra to selectEmail

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

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index f07cb2c8599e9e68145b196a4963ed3629e73379..4cde3c0d2e497391c17afc8f6f3bef1ccb9f95c0 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -236,6 +236,13 @@ class Adminer {
                echo "</div></fieldset>\n";
        }
        
+       /** Print extra text in the end of a select form
+       * @param array fields holding e-mails
+       * @return null
+       */
+       function selectEmailPrint($emailFields) {
+       }
+       
        /** Process columns box in select
        * @param array selectable columns
        * @return array (array(select_expressions), array(group_expressions))
@@ -322,18 +329,11 @@ class Adminer {
                return (isset($_GET["text_length"]) ? $_GET["text_length"] : "100");
        }
        
-       /** Print extra text in the end of a select form
-       * @param array fields holding e-mails
-       * @return null
-       */
-       function selectExtraPrint($emailFields) {
-       }
-       
        /** Process extras in select form
        * @param array AND conditions
        * @return bool true if processed, false to process other parts of form
        */
-       function selectExtraProcess($where) {
+       function selectEmailProcess($where) {
                return false;
        }
        

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 166545c897f2d2d53005c8948d4533510dcca2ff..e503886e6d2b1d8679f01b4109ada7d38bb19a90 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -54,7 +54,7 @@ if ($_POST && !$error) {
                }
                exit;
        }
-       if (!$adminer->selectExtraProcess($where)) {
+       if (!$adminer->selectEmailProcess($where)) {
                if (!$_POST["import"]) { // edit
                        $result = true;
                        $affected = 0;
@@ -272,7 +272,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->selectExtraPrint(array_filter($email_fields, 'strlen'));
+               $adminer->selectEmailPrint(array_filter($email_fields, 'strlen'));
                
                echo "</form>\n";
        }

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 9d8db8a5551397a254a1b2817ca2c44ccd90c280..483ff1c1b2169ee750faad65e604f9794de72091 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -183,6 +183,19 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
                echo "</div></fieldset>\n";
        }
        
+       function selectEmailPrint($emailFields) {
+               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";
+                       echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . htmlspecialchars(key($emailFields)) . '">' : '<select name="email_field">' . optionlist($emailFields) . '</select> ');
+                       echo "<input type='submit' name='email' value='" . lang('Send') . "'$confirm>\n";
+                       echo "</div></fieldset>\n";
+               }
+       }
+       
        function selectColumnsProcess($columns, $indexes) {
                return array(array(), array());
        }
@@ -230,20 +243,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
                return "100";
        }
        
-       function selectExtraPrint($emailFields) {
-               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";
-                       echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . htmlspecialchars(key($emailFields)) . '">' : '<select name="email_field">' . optionlist($emailFields) . '</select> ');
-                       echo "<input type='submit' name='email' value='" . lang('Send') . "'$confirm>\n";
-                       echo "</div></fieldset>\n";
-               }
-       }
-       
-       function selectExtraProcess($where) {
+       function selectEmailProcess($where) {
                global $dbh;
                if ($_POST["email"]) {
                        $sent = 0;