Merge pull request #1769 from jow-/master

UCI apply/rollback workflow

diff --combined modules/luci-base/luasrc/dispatcher.lua
index 38932af,baaa95a..45e1e30
--- 1/modules/luci-base/luasrc/dispatcher.lua
--- 2/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@@ -182,6 -182,7 +182,7 @@@ local function session_retrieve(sid, al
           (not allowed_users or
            util.contains(allowed_users, sdat.values.username))
        then
+               uci:set_session_id(sid)
                return sid, sdat.values
        end
  
@@@ -428,9 -429,7 +429,9 @@@ function dispatch(request
                                return
                        end
  
 -                      http.header("Set-Cookie", 'sysauth=%s; path=%s' %{ sid, build_url() })
 +                      http.header("Set-Cookie", 'sysauth=%s; path=%s; HttpOnly%s' %{
 +                              sid, build_url(), http.getenv("HTTPS") == "on" and "; secure" or ""
 +                      })
                        http.redirect(build_url(unpack(ctx.requestpath)))
                end
  
@@@ -884,6 -883,8 +885,8 @@@ local function _cbi(self, ...
        local pageaction = true
        local parsechain = { }
  
+       local is_rollback, time_remaining = uci:rollback_pending()
+ 
        for i, res in ipairs(maps) do
                if res.apply_needed and res.parsechain then
                        local c
@@@ -911,6 -912,7 +914,7 @@@
                res:render({
                        firstmap   = (i == 1),
                        applymap   = applymap,
+                       confirmmap = (is_rollback and time_remaining or nil),
                        redirect   = redirect,
                        messages   = messages,
                        pageaction = pageaction,