From c2199c51014d7e78e67efa915856cfb4353c5fd0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 4 Jan 2018 12:48:46 +0100
Subject: [PATCH] Cleanup folder subscriptions "form"

---
 program/steps/settings/folders.inc   | 9 +++------
 skins/classic/templates/folders.html | 2 +-
 skins/larry/templates/folders.html   | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index a57cf01a9..703a9480f 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -187,7 +187,7 @@ $OUTPUT->add_label('deletefolderconfirm', 'purgefolderconfirm', 'folderdeleting'
 
 // register UI objects
 $OUTPUT->add_handlers(array(
-    'foldersubscription' => 'rcmail_subscription_form',
+    'foldersubscription' => 'rcmail_folder_subscriptions',
     'folderframe'        => 'rcmail_folder_frame',
     'folderfilter'       => 'rcmail_folder_filter',
     'quotadisplay'       => array($RCMAIL, 'quota_display'),
@@ -198,13 +198,10 @@ $OUTPUT->send('folders');
 
 
 // build table with all folders listed by server
-function rcmail_subscription_form($attrib)
+function rcmail_folder_subscriptions($attrib)
 {
     global $RCMAIL, $OUTPUT;
 
-    list($form_start, $form_end) = get_form_tags($attrib, 'folders');
-    unset($attrib['form']);
-
     if (!$attrib['id']) {
         $attrib['id'] = 'rcmSubscriptionlist';
     }
@@ -391,7 +388,7 @@ function rcmail_subscription_form($attrib)
     $OUTPUT->set_env('collapsed_folders', $collapsed);
     $OUTPUT->set_env('delimiter', $delimiter);
 
-    return $form_start . html::tag('ul', $attrib, implode('', $folders), html::$common_attrib) . $form_end;
+    return html::tag('ul', $attrib, implode('', $folders), html::$common_attrib);
 }
 
 function rcmail_folder_tree_element($folders, &$key, &$js_folders)
diff --git a/skins/classic/templates/folders.html b/skins/classic/templates/folders.html
index ac114787d..eb41da3d5 100644
--- a/skins/classic/templates/folders.html
+++ b/skins/classic/templates/folders.html
@@ -32,7 +32,7 @@
     </div>
 </div>
 <div id="folderlist-content" class="boxlistcontent">
-    <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
+    <roundcube:object name="foldersubscription" id="subscription-table"
         summary="Folder subscription table" class="treelist folderlist" />
 </div>
 <div id="folderlist-footer" class="boxfooter">
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index c8efc98ba..6b7978387 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -32,7 +32,7 @@
 	</div>
 </div>
 <div id="folderslist-content" class="scroller withfooter">
-	<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" class="treelist listing folderlist" />
+	<roundcube:object name="foldersubscription" id="subscription-table" class="treelist listing folderlist" />
 </div>
 <div id="folderslist-footer" class="boxfooter">
 	<roundcube:button command="create-folder" type="link" title="createfolder" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="createfolder" /><roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="return UI.toggle_popup('mailboxmenu',event)" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false" aria-owns="mailboxoptionsmenu" />