Changeset:
1bc83a43d623
https://sourceforge.net/p/mrbs/hg-code/ci/1bc83a43d6235cfc315001470fa1b13226ca2227
Author:
Campbell Morrison <[email protected]>
Date:
Sun Mar 19 14:02:27 2017 +0000
Log message:
Restructured
diffstat:
web/view_entry.php | 73 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 15 deletions(-)
diffs (103 lines):
diff -r a1520fac8671 -r 1bc83a43d623 web/view_entry.php
--- a/web/view_entry.php Sun Mar 19 12:05:13 2017 +0000
+++ b/web/view_entry.php Sun Mar 19 14:02:27 2017 +0000
@@ -5,23 +5,40 @@
require_once "mrbs_sql.inc";
require_once "functions_view.inc";
-// Generates a single button
-function generateButton($form_action, $id, $series, $action_type, $returl,
$submit_value, $title='')
+// Generates a single button. Parameters in the array $params
+//
+// Manadatory parameters
+// action The form action attribute
+// value The value of the button
+// inputs An array of hidden form inputs, each element indexed
+// by 'name' and 'value'
+//
+// Optional parameters
+// title a title
+function generate_button(array $params)
{
- if (!isset($form_id))
+ $html = '';
+
+ $form_id = uniqid();
+
+ $html .= "<button form=\"$form_id\" value=\"" .
htmlspecialchars($params['value']) . '"';
+ $html .= (isset($params['title'])) ? ' title="' .
htmlspecialchars($params['title']) . '"' : '';
+ $html .= '>' . htmlspecialchars($params['value']) . "</button>\n";
+
+ $html .= "<form id=\"$form_id\" method=\"post\" action=\"" .
htmlspecialchars($params['action']) . "\">\n";
+
+ foreach ($params['inputs'] as $input)
{
- $form_id = uniqid();
+ $html .= '<input type="hidden" name="' . htmlspecialchars($input['name'])
. '"' .
+ ' value="' . htmlspecialchars($input['value']) . "\">\n";
}
- echo "<button form=\"$form_id\" title=\"" . htmlspecialchars($title) . "\"
value=\"$submit_value\">" .
- $submit_value . "</button>\n";
- echo "<form id=\"$form_id\" action=\"".htmlspecialchars($form_action).
- "?id=$id&series=$series\" method=\"post\">\n";
- echo "<input type=\"hidden\" name=\"action\" value=\"$action_type\">\n";
- echo "<input type=\"hidden\" name=\"returl\" value=\"" .
htmlspecialchars($returl) . "\">\n";
- echo "</form>\n";
+ $html .= "</form>\n";
+
+ echo $html;
}
+
// Generates the Approve, Reject and More Info buttons
function generateApproveButtons($id, $series)
{
@@ -48,9 +65,29 @@
echo "<tr>\n";
echo "<td>" . ($series ? get_vocab("series") : get_vocab("entry")) .
"</td>\n";
echo "<td>\n";
- generateButton("approve_entry_handler.php", $id, $series, "approve",
$returl, get_vocab("approve"));
- generateButton($this_page, $id, $series, "reject", $returl,
get_vocab("reject"));
- generateButton($this_page, $id, $series, "more_info", $returl,
get_vocab("more_info"), $info_title);
+
+ // Approve
+ $params = array('action' =>
"approve_entry_handler.php?id=$id&series=$series",
+ 'value' => get_vocab('approve'),
+ 'inputs' => array(array('name' => 'action', 'value' =>
'approve'),
+ array('name' => 'returl', 'value' =>
$returl)));
+ generate_button($params);
+
+ // Reject
+ $params = array('action' => "$this_page?id=$id&series=$series",
+ 'value' => get_vocab('reject'),
+ 'inputs' => array(array('name' => 'action', 'value' =>
'reject'),
+ array('name' => 'returl', 'value' =>
$returl)));
+ generate_button($params);
+
+ // More info
+ $params = array('action' => "$this_page?id=$id&series=$series",
+ 'value' => get_vocab('more_info'),
+ 'inputs' => array(array('name' => 'action', 'value' =>
'more_info'),
+ array('name' => 'returl', 'value' =>
$returl)),
+ 'title' => $info_title);
+ generate_button($params);
+
echo "</td>\n";
echo "</tr>\n";
}
@@ -73,7 +110,13 @@
echo "<tr>\n";
echo "<td> </td>\n";
echo "<td>\n";
- generateButton("approve_entry_handler.php", $id, $series, "remind",
$this_page . "?id=$id&area=$area", get_vocab("remind_admin"));
+
+ $params = array('action' =>
"approve_entry_handler.php?id=$id&series=$series",
+ 'value' => get_vocab('remind_admin'),
+ 'inputs' => array(array('name' => 'action', 'value' =>
'remind'),
+ array('name' => 'returl', 'value' =>
"$this_page?id=$id&area=$area")));
+ generate_button($params);
+
echo "</td>\n";
echo "</tr>\n";
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
