Merge 0.9->0.10

diff --cc plugins/muc/muc.lib.lua
index 6f21ec3a14013afa92cecd899c60bc9ecc51f47d,5879c256c36f1f04bf9090a037a0e5dbae0205fe..b96288edab0f2fa4359ccd8eb3537ade22ca2372
--- 1/plugins/muc/muc.lib.lua
--- 2/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@@ -674,52 -668,85 +674,52 @@@ function room_mt:process_form(origin, s
        if form.attr.type == "cancel" then origin.send(st.reply(stanza)); return; end
        if form.attr.type ~= "submit" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Not a submitted form")); return; end
  
 -      local fields = self:get_form_layout():data(form);
 -      if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration")); return; end
 -
 -      local dirty = false
 -
 -      local event = { room = self, fields = fields, changed = dirty };
 -      module:fire_event("muc-config-submitted", event);
 -      dirty = event.changed or dirty;
 -
 -      local name = fields['muc#roomconfig_roomname'];
 -      if name ~= self:get_name() then
 -              self:set_name(name);
 +      local fields, errors, present = self:get_form_layout(stanza.attr.from):data(form);
 +      if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then
 +              origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration"));
 +              return;
        end
  
 -      local description = fields['muc#roomconfig_roomdesc'];
 -      if description ~= self:get_description() then
 -              self:set_description(description);
 -      end
 -
 -      local persistent = fields['muc#roomconfig_persistentroom'];
 -      dirty = dirty or (self:is_persistent() ~= persistent)
 -      module:log("debug", "persistent=%s", tostring(persistent));
 -
 -      local moderated = fields['muc#roomconfig_moderatedroom'];
 -      dirty = dirty or (self:is_moderated() ~= moderated)
 -      module:log("debug", "moderated=%s", tostring(moderated));
 +      local changed = {};
  
 -      local membersonly = fields['muc#roomconfig_membersonly'];
 -      dirty = dirty or (self:is_members_only() ~= membersonly)
 -      module:log("debug", "membersonly=%s", tostring(membersonly));
 -
 -      local public = fields['muc#roomconfig_publicroom'];
 -      dirty = dirty or (self:is_hidden() ~= (not public and true or nil))
 -
 -      local changesubject = fields['muc#roomconfig_changesubject'];
 -      dirty = dirty or (self:get_changesubject() ~= (not changesubject and true or nil))
 -      module:log('debug', 'changesubject=%s', changesubject and "true" or "false")
 -
 -      local historylength = tonumber(fields['muc#roomconfig_historylength']);
 -      dirty = dirty or (historylength and (self:get_historylength() ~= historylength));
 -      module:log('debug', 'historylength=%s', historylength)
 -
 -
 -      local whois = fields['muc#roomconfig_whois'];
 -      if not valid_whois[whois] then
 -          origin.send(st.error_reply(stanza, 'cancel', 'bad-request', "Invalid value for 'whois'"));
 -          return;
 +      local function handle_option(name, field, allowed)
 +              if not present[field] then return; end
 +              local new = fields[field];
 +              if allowed and not allowed[new] then return; end
 +              if new == self["get_"..name](self) then return; end
 +              changed[name] = true;
 +              self["set_"..name](self, new);
        end
 -      local whois_changed = self._data.whois ~= whois
 -      self._data.whois = whois
 -      module:log('debug', 'whois=%s', whois)
  
 -      local password = fields['muc#roomconfig_roomsecret'];
 -      if self:get_password() ~= password then
 -              self:set_password(password);
 -      end
 -      self:set_moderated(moderated);
 -      self:set_members_only(membersonly);
 -      self:set_persistent(persistent);
 -      self:set_hidden(not public);
 -      self:set_changesubject(changesubject);
 -      self:set_historylength(historylength);
 +      local event = { room = self, fields = fields, changed = changed, stanza = stanza, origin = origin, update_option = handle_option };
 +      module:fire_event("muc-config-submitted", event);
 +
 +      handle_option("name", "muc#roomconfig_roomname");
 +      handle_option("description", "muc#roomconfig_roomdesc");
 +      handle_option("persistent", "muc#roomconfig_persistentroom");
 +      handle_option("moderated", "muc#roomconfig_moderatedroom");
 +      handle_option("members_only", "muc#roomconfig_membersonly");
 +      handle_option("public", "muc#roomconfig_publicroom");
 +      handle_option("changesubject", "muc#roomconfig_changesubject");
 +      handle_option("historylength", "muc#roomconfig_historylength");
 +      handle_option("whois", "muc#roomconfig_whois", valid_whois);
 +      handle_option("password", "muc#roomconfig_roomsecret");
  
        if self.save then self:save(true); end
 +      if self.locked then
 +              module:fire_event("muc-room-unlocked", { room = self });
 +              self.locked = nil;
 +      end
        origin.send(st.reply(stanza));
  
 -      if dirty or whois_changed then
 +      if next(changed) then
                local msg = st.message({type='groupchat', from=self.jid})
-                       :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}):up()
 -                      :tag('x', {xmlns='http://jabber.org/protocol/muc#user'});
 -
 -              if dirty then
 -                      msg.tags[1]:tag('status', {code = '104'}):up();
 -              end
 -              if whois_changed then
 -                      local code = (whois == 'moderators') and "173" or "172";
++                      :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
 +                              :tag('status', {code = '104'}):up();
 +              if changed.whois then
 +                      local code = (self:get_whois() == 'moderators') and "173" or "172";
                        msg.tags[1]:tag('status', {code = code}):up();
                end
 -              msg:up();
 -
                self:broadcast_message(msg, false)
        end
  end