Permalink
Browse files

Limit commands and import in customization (bug #3194432)

  • Loading branch information...
1 parent d2c513d commit e641e5ceba7b5c78807293038f58ff74222a5c6e @vrana committed May 24, 2011
Showing with 43 additions and 7 deletions.
  1. +16 −0 adminer/include/adminer.inc.php
  2. +9 −7 adminer/select.inc.php
  3. +8 −0 editor/include/adminer.inc.php
  4. +10 −0 plugins/plugin.php
@@ -1,4 +1,6 @@
<?php
+// any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
+
class Adminer {
/** @var array operators used in select, null for all operators */
var $operators;
@@ -295,6 +297,20 @@ function selectActionPrint() {
echo "</div></fieldset>\n";
}
+ /** Print command box in select
+ * @return bool whether to print default commands
+ */
+ function selectCommandPrint() {
+ return !information_schema(DB);
+ }
+
+ /** Print import box in select
+ * @return bool whether to print default import
+ */
+ function selectImportPrint() {
+ return true;
+ }
+
/** Print extra text in the end of a select form
* @param array fields holding e-mails
* @param array selectable columns
View
@@ -395,7 +395,7 @@
}
echo " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " . checkbox("all", 1, 0, lang('whole result')) . "\n";
- if (!information_schema(DB)) {
+ if ($adminer->selectCommandPrint()) {
?>
<fieldset><legend><?php echo lang('Edit'); ?></legend><div>
<input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>" class="jsonly">
@@ -412,12 +412,14 @@
echo " <input type='submit' name='export' value='" . lang('Export') . "' onclick='eventStop(event);'>\n";
echo "</div></fieldset>\n";
}
- print_fieldset("import", lang('Import'), !$rows);
- echo "<input type='file' name='csv_file'> ";
- echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_export["format"], 1); // 1 - select
- echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
- echo "<input type='hidden' name='token' value='$token'>\n";
- echo "</div></fieldset>\n";
+ if ($adminer->selectImportPrint()) {
+ print_fieldset("import", lang('Import'), !$rows);
+ echo "<input type='file' name='csv_file'> ";
+ echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_export["format"], 1); // 1 - select
+ echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
+ echo "<input type='hidden' name='token' value='$token'>\n";
+ echo "</div></fieldset>\n";
+ }
$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
@@ -275,6 +275,14 @@ function selectActionPrint() {
echo "</div></fieldset>\n";
}
+ function selectCommandPrint() {
+ return true;
+ }
+
+ function selectImportPrint() {
+ return true;
+ }
+
function selectEmailPrint($emailFields, $columns) {
if ($emailFields) {
print_fieldset("email", lang('E-mail'), $_POST["email_append"]);
View
@@ -215,6 +215,16 @@ function selectActionPrint() {
return $this->_applyPlugin(__FUNCTION__, $args);
}
+ function selectCommandPrint() {
+ $args = func_get_args();
+ return $this->_applyPlugin(__FUNCTION__, $args);
+ }
+
+ function selectImportPrint() {
+ $args = func_get_args();
+ return $this->_applyPlugin(__FUNCTION__, $args);
+ }
+
function selectEmailPrint() {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);

0 comments on commit e641e5c

Please sign in to comment.