beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

E-mail sending only in Editor

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@899 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-24 10:52:24 +00:00
parent 97b8c7b666
commit 00d9b3618a
5 changed files with 104 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
adminer/include/adminer.inc.php
View file

@ -120,6 +120,22 @@ function adminer_select_val($val, $link, $field) {
return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link); return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link);
} }
/** Print extra text in the end of a select form
* @param array fields holding e-mails
* @return bool whether to print default extra
*/
function adminer_select_extra_display($email_fields) {
call_adminer('select_extra_display', false, $email_fields);
}
/** Process extras in select form
* @param array AND conditions
* @return bool true if processed, false to process other parts of form
*/
function adminer_select_extra_process($where) {
return call_adminer('select_extra_process', false, $where);
}
/** Query printed after execution in the message /** Query printed after execution in the message
* @param string executed query * @param string executed query
* @return string * @return string

123
adminer/select.inc.php
View file

@ -109,72 +109,63 @@ if ($_POST && !$error) {
} }
exit; exit;
} }
if ($_POST["email"]) { if (!adminer_select_extra_process($where)) {
$sent = 0; if (!$_POST["import"]) { // edit
if ($_POST["all"] || $_POST["check"]) { $result = true;
$field = idf_escape($_POST["email_field"]); $affected = 0;
$result = $dbh->query("SELECT DISTINCT $field FROM " . idf_escape($_GET["select"]) . " WHERE $field IS NOT NULL AND $field != ''" . ($where ? " AND " . implode(" AND ", $where) : "") . ($_POST["all"] ? "" : " AND ($where_check)")); $command = ($_POST["delete"] ? ($_POST["all"] && !$where ? "TRUNCATE " : "DELETE FROM ") : ($_POST["clone"] ? "INSERT INTO " : "UPDATE ")) . idf_escape($_GET["select"]);
while ($row = $result->fetch_row()) { if (!$_POST["delete"]) {
$sent += mail($row[0], email_header($_POST["email_subject"]), $_POST["email_message"], "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit" . ($_POST["email_from"] ? "\nFrom: " . email_header($_POST["email_from"]) : "")); $set = array();
} foreach ($columns as $name => $val) { //! should check also for edit or insert privileges
$result->free(); $val = process_input($name, $fields[$name]);
} if ($_POST["clone"]) {
redirect(remove_from_uri(), lang('%d e-mail(s) have been sent.', $sent)); $set[] = ($val !== false ? $val : idf_escape($name));
} elseif (!$_POST["import"]) { // edit } elseif ($val !== false) {
$result = true; $set[] = idf_escape($name) . " = $val";
$affected = 0; }
$command = ($_POST["delete"] ? ($_POST["all"] && !$where ? "TRUNCATE " : "DELETE FROM ") : ($_POST["clone"] ? "INSERT INTO " : "UPDATE ")) . idf_escape($_GET["select"]); }
if (!$_POST["delete"]) { $command .= ($_POST["clone"] ? "\nSELECT " . implode(", ", $set) . "\nFROM " . idf_escape($_GET["select"]) : " SET\n" . implode(",\n", $set));
$set = array(); }
foreach ($columns as $name => $val) { //! should check also for edit or insert privileges if ($_POST["delete"] || $set) {
$val = process_input($name, $fields[$name]); if ($_POST["all"] || ($primary === array() && $_POST["check"])) {
if ($_POST["clone"]) { $result = queries($command . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
$set[] = ($val !== false ? $val : idf_escape($name)); $affected = $dbh->affected_rows;
} elseif ($val !== false) { } else {
$set[] = idf_escape($name) . " = $val"; foreach ((array) $_POST["check"] as $val) {
} // where is not unique so OR can't be used
} $result = queries($command . "\nWHERE " . where_check($val) . "\nLIMIT 1");
$command .= ($_POST["clone"] ? "\nSELECT " . implode(", ", $set) . "\nFROM " . idf_escape($_GET["select"]) : " SET\n" . implode(",\n", $set)); if (!$result) {
} break;
if ($_POST["delete"] || $set) { }
if ($_POST["all"] || ($primary === array() && $_POST["check"])) { $affected += $dbh->affected_rows;
$result = queries($command . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
$affected = $dbh->affected_rows;
} else {
foreach ((array) $_POST["check"] as $val) {
// where is not unique so OR can't be used
$result = queries($command . "\nWHERE " . where_check($val) . "\nLIMIT 1");
if (!$result) {
break;
} }
$affected += $dbh->affected_rows;
} }
} }
} query_redirect(queries(), remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result, false, !$result);
query_redirect(queries(), remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result, false, !$result); //! display edit page in case of an error
//! display edit page in case of an error } elseif (is_string($file = get_file("csv_file"))) {
} elseif (is_string($file = get_file("csv_file"))) { $file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set
$file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set $cols = "";
$cols = ""; $rows = array(); //! packet size
$rows = array(); //! packet size preg_match_all('~("[^"]*"|[^"\\n]+)+~', $file, $matches);
preg_match_all('~("[^"]*"|[^"\\n]+)+~', $file, $matches); foreach ($matches[0] as $key => $val) {
foreach ($matches[0] as $key => $val) { $row = array();
$row = array(); preg_match_all('~(("[^"]*")+|[^,]*),~', "$val,", $matches2);
preg_match_all('~(("[^"]*")+|[^,]*),~', "$val,", $matches2); if (!$key && !array_diff($matches2[1], array_keys($fields))) { //! doesn't work with column names containing ",\n
if (!$key && !array_diff($matches2[1], array_keys($fields))) { //! doesn't work with column names containing ",\n // first row corresponds to column names - use it for table structure
// first row corresponds to column names - use it for table structure $cols = " (" . implode(", ", array_map('idf_escape', $matches2[1])) . ")";
$cols = " (" . implode(", ", array_map('idf_escape', $matches2[1])) . ")"; } else {
} else { foreach ($matches2[1] as $col) {
foreach ($matches2[1] as $col) { $row[] = (!strlen($col) ? "NULL" : $dbh->quote(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
$row[] = (!strlen($col) ? "NULL" : $dbh->quote(str_replace('""', '"', preg_replace('~^"|"$~', '', $col)))); }
$rows[] = "\n(" . implode(", ", $row) . ")";
} }
$rows[] = "\n(" . implode(", ", $row) . ")";
} }
$result = queries("INSERT INTO " . idf_escape($_GET["select"]) . "$cols VALUES" . implode(",", $rows));
query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) has been imported.', $dbh->affected_rows), $result, false, !$result);
} else {
$error = upload_error($file);
} }
$result = queries("INSERT INTO " . idf_escape($_GET["select"]) . "$cols VALUES" . implode(",", $rows));
query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) has been imported.', $dbh->affected_rows), $result, false, !$result);
} else {
$error = upload_error($file);
} }
} }
@ -390,17 +381,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"; 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";
//! Editor only adminer_select_extra_display(array_filter($email_fields)); //! should use strlen but compile.php doesn't support array_filter
$email_fields = array_filter($email_fields); //! should use strlen but compile.php doesn't support array_filter
if ($email_fields) {
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($email_fields) == 1 ? '<input type="hidden" name="email_field" value="' . htmlspecialchars(key($email_fields)) . '">' : '<select name="email_field">' . optionlist($email_fields) . '</select> ');
echo "<input type='submit' name='email' value='" . lang('Send') . "'$confirm>\n";
echo "</div></fieldset>\n";
}
echo "</form>\n"; echo "</form>\n";
} }

6
changes.txt
View file

@ -1,10 +1,12 @@
Adminer 2.0.0: Adminer 2.0.0:
Editor: User friendly data editor Editor: User friendly data editor
Customization: Adminer class Customization: Adminer class
E-mail sending
Table relations (Editor)
Create single column foreign key in table structure Create single column foreign key in table structure
Table relations (Editor)
Send e-mails (Editor)
Display images in blob (Editor)
Separate types to groups in table creation Separate types to groups in table creation
Link e-mails in select
Show type in field name title (thanks to Jakub Sochor) Show type in field name title (thanks to Jakub Sochor)
Preselect now() for timestamp columns (thanks to paranoiq) Preselect now() for timestamp columns (thanks to paranoiq)
Clear history (thanks to paranoiq) Clear history (thanks to paranoiq)

31
editor/include/adminer.inc.php
View file

@ -118,6 +118,37 @@ function adminer_select_val($val, $link, $field) {
return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link); return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link);
} }
function adminer_select_extra_display($email_fields) {
global $confirm;
if (call_adminer('select_extra_display', true, $email_fields) && $email_fields) {
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($email_fields) == 1 ? '<input type="hidden" name="email_field" value="' . htmlspecialchars(key($email_fields)) . '">' : '<select name="email_field">' . optionlist($email_fields) . '</select> ');
echo "<input type='submit' name='email' value='" . lang('Send') . "'$confirm>\n";
echo "</div></fieldset>\n";
}
}
function adminer_select_extra_process($where) {
global $dbh;
if ($_POST["email"]) {
$sent = 0;
if ($_POST["all"] || $_POST["check"]) {
$where_check = "(" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . ")";
$field = idf_escape($_POST["email_field"]);
$result = $dbh->query("SELECT DISTINCT $field FROM " . idf_escape($_GET["select"]) . " WHERE $field IS NOT NULL AND $field != ''" . ($where ? " AND " . implode(" AND ", $where) : "") . ($_POST["all"] ? "" : " AND ($where_check)"));
while ($row = $result->fetch_row()) {
$sent += mail($row[0], email_header($_POST["email_subject"]), $_POST["email_message"], "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit" . ($_POST["email_from"] ? "\nFrom: " . email_header($_POST["email_from"]) : ""));
}
$result->free();
}
redirect(remove_from_uri(), lang('%d e-mail(s) have been sent.', $sent));
}
return call_adminer('select_extra_process', false, $where);
}
function adminer_message_query($query) { function adminer_message_query($query) {
return call_adminer('message_query', "<!--\n" . str_replace("--", "--><!--", $query) . "\n-->", $query); return call_adminer('message_query', "<!--\n" . str_replace("--", "--><!--", $query) . "\n-->", $query);
} }

2
todo.txt
View file

@ -28,4 +28,4 @@ JavaScript data validation
Joining tables - PRIMARY KEY (table, joining) Joining tables - PRIMARY KEY (table, joining)
Simplify search - textual, from-to Simplify search - textual, from-to
Rank, Tree structure Rank, Tree structure
Treat tinyint(1) as bool Treat tinyint(1) as bool, format date