alecpl
2009-05-31 d257c4064f68d3c43ca3330b466eb4d7eaaa1165
- don't register body handler on plugin init (#1485888)


2 files modified
11 ■■■■ changed files
plugins/password/password.php 7 ●●●● patch | view | raw | blame | history
plugins/sasl_password/sasl_password.php 4 ●●● patch | view | raw | blame | history
plugins/password/password.php
@@ -90,13 +90,14 @@
    $rcmail->output->add_label('password');
    $this->register_action('plugin.password', array($this, 'password_init'));
    $this->register_action('plugin.password-save', array($this, 'password_save'));
    $this->register_handler('plugin.body', array($this, 'password_form'));
    $this->include_script('password.js');
  }
  function password_init()
  {
    $this->add_texts('localization/');
    $this->register_handler('plugin.body', array($this, 'password_form'));
    $rcmail = rcmail::get_instance();
    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
    $rcmail->output->send('plugin');
@@ -107,9 +108,11 @@
    $rcmail = rcmail::get_instance();
    $this->add_texts('localization/');
    $confirm = $rcmail->config->get('password_confirm_current');
    $this->register_handler('plugin.body', array($this, 'password_form'));
    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
    $confirm = $rcmail->config->get('password_confirm_current');
    if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))
      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
    else {
plugins/sasl_password/sasl_password.php
@@ -26,13 +26,14 @@
    $rcmail->output->add_label('password');
    $this->register_action('plugin.saslpassword', array($this, 'password_init'));
    $this->register_action('plugin.saslpassword-save', array($this, 'password_save'));
    $this->register_handler('plugin.body', array($this, 'password_form'));
    $this->include_script('sasl_password.js');
  }
  function password_init()
  {
    $this->add_texts('locale/');
    $this->register_handler('plugin.body', array($this, 'password_form'));
    $rcmail = rcmail::get_instance();
    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
    $rcmail->output->send('plugin');
@@ -43,6 +44,7 @@
    $rcmail = rcmail::get_instance();
    $this->add_texts('locale/');
    $this->register_handler('plugin.body', array($this, 'password_form'));
    if (!isset($_POST['_curpasswd']) || !isset($_POST['_newpasswd'])) {
      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');