summaryrefslogtreecommitdiff
path: root/modules/server_add
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2012-05-19 11:20:47 -0700
committerBharat Mediratta <bharat@menalto.com>2012-05-19 11:31:25 -0700
commit74fa9422db01fbc017ddbc847333cc7847f185ab (patch)
treeb082ef71b151f245d3f97f7effad4b34b652cd35 /modules/server_add
parent85536f4ffcb8a7a20f69c8b011d3cf06b9ec68f3 (diff)
Revert "Prevent server_add autocomplete from being interpreted as UTF-7. Fixes #1871."
This only fixes server_add, we need to fix it more systemically. This reverts commit 88c0363344860ff87bb7fa2d084b8ab190b364cb.
Diffstat (limited to 'modules/server_add')
-rw-r--r--modules/server_add/controllers/admin_server_add.php3
-rw-r--r--modules/server_add/views/admin_server_add.html.php17
2 files changed, 2 insertions, 18 deletions
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 7e63e4ae..954c9ef6 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -71,13 +71,14 @@ class Admin_Server_Add_Controller extends Admin_Controller {
}
public function autocomplete() {
- $directories = array('<meta http-equiv="content-type" content="text/html; charset=utf-8">');
+ $directories = array();
$path_prefix = Input::instance()->get("q");
foreach (glob("{$path_prefix}*") as $file) {
if (is_dir($file) && !is_link($file)) {
$directories[] = html::clean($file);
}
}
+
print implode("\n", $directories);
}
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index b8443446..176cff72 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -9,23 +9,6 @@ $("document").ready(function() {
{
max: 256,
loadingClass: "g-loading-small",
- parse: function(data) {
- var parsed = [];
- var rows = data.split("\n");
- rows.shift(); // drop <META> tag
- for (var i=0; i < rows.length; i++) {
- var row = $.trim(rows[i]);
- if (row) {
- row = row.split("|");
- parsed[parsed.length] = {
- data: row,
- value: row[0],
- result: row[0]
- };
- }
- }
- return parsed;
- }
});
});
</script>