Merged branch devel-api (from r2208 to r2387) back into trunk (omitting some sample plugins)

4 files changed, 234 insertions, 0 deletions

diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
new file mode 100644
index 000000000..b54bcd4c9
--- /dev/null
+++ b/plugins/password/localization/en_US.inc
@@ -0,0 +1,15 @@
+<?php
+
+$labels = array();
+$labels['changepasswd']  = 'Change Password';
+$labels['curpasswd']  = 'Current Password:';
+$labels['newpasswd']  = 'New Password:';
+$labels['confpasswd']  = 'Confirm New Password:';
+
+$messages = array();
+$messages['nopassword'] = "Please input new password.";
+$messages['nocurpassword'] = "Please input current password.";
+$messages['passwordincorrectly'] = "Current password incorrectly.";
+$messages['passwordinconsistency'] = "Inconsistency of password, please try again.";
+
+?>
\ No newline at end of file
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
new file mode 100644
index 000000000..197999531
--- /dev/null
+++ b/plugins/password/localization/pl_PL.inc
@@ -0,0 +1,15 @@
+<?php
+
+$labels = array();
+$labels['changepasswd']  = 'Zmiana hasła';
+$labels['curpasswd']  = 'Aktualne hasło:';
+$labels['newpasswd']  = 'Nowe hasło:';
+$labels['confpasswd']  = 'Potwierdź hasło:';
+
+$messages = array();
+$messages['nopassword'] = 'Wprowadź nowe hasło.';
+$messages['nocurpassword'] = 'Wprowadź aktualne hasło.';
+$messages['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
+$messages['passwordinconsistency'] = 'Hasła nie pasują, spróbuj ponownie.';
+
+?>
diff --git a/plugins/password/password.js b/plugins/password/password.js
new file mode 100644
index 000000000..3d05b622b
--- /dev/null
+++ b/plugins/password/password.js
@@ -0,0 +1,44 @@
+/* Password change interface (tab) */
+
+if (window.rcmail) {
+  rcmail.addEventListener('init', function(evt) {
+    // <span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
+    var tab = $('<span>').attr('id', 'settingstabpluginpassword').addClass('tablink');
+    
+    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.password').html(rcmail.gettext('password')).appendTo(tab);
+    button.bind('click', function(e){ return rcmail.command('plugin.password', this) });
+
+    // add button and register commands
+    rcmail.add_element(tab, 'tabs');
+    rcmail.register_command('plugin.password', function() { rcmail.goto_url('plugin.password') }, true);
+    rcmail.register_command('plugin.password-save', function() { 
+	var input_curpasswd = rcube_find_object('_curpasswd');
+	var input_newpasswd = rcube_find_object('_newpasswd');
+        var input_confpasswd = rcube_find_object('_confpasswd');
+	
+	if (input_curpasswd && input_curpasswd.value=='') {
+	    alert(rcmail.gettext('nocurpassword', 'password'));
+	    input_curpasswd.focus();
+	} else if (input_newpasswd && input_newpasswd.value=='') {
+	    alert(rcmail.gettext('nopassword', 'password'));
+	    input_newpasswd.focus();
+	} else if (input_confpasswd && input_confpasswd.value=='') {
+	    alert(rcmail.gettext('nopassword', 'password'));
+	    input_confpasswd.focus();
+	} else if ((input_newpasswd && input_confpasswd) && (input_newpasswd.value != input_confpasswd.value)) {
+	    alert(rcmail.gettext('passwordinconsistency', 'password'));
+	    input_newpasswd.focus();
+	} else {
+	    rcmail.gui_objects.passform.submit();
+	}
+    }, true);
+  })
+
+    // set page title
+    if (rcmail.env.action == 'plugin.password' && rcmail.env.task == 'settings') {
+      var title = rcmail.gettext('changepasswd','password')
+      if (rcmail.env.product_name)
+        title = rcmail.env.product_name + ' :: ' + title;
+      rcmail.set_pagetitle(title);
+    }
+}
diff --git a/plugins/password/password.php b/plugins/password/password.php
new file mode 100644
index 000000000..4a35da119
--- /dev/null
+++ b/plugins/password/password.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Change Password
+ *
+ * Sample plugin that adds a possibility to change password
+ * (Settings -> Password tab)
+ *
+ * @version 1.0
+ * @author Aleksander 'A.L.E.C' Machniak
+ */
+class password extends rcube_plugin
+{
+  public $task = 'settings';
+
+  function init()
+  {
+    $rcmail = rcmail::get_instance();
+    // add Tab label
+    $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/');
+    rcmail::get_instance()->output->send('plugin');
+  }
+  
+  function password_save()
+  {
+    $rcmail = rcmail::get_instance();
+
+    $this->add_texts('localization/');
+
+    if (!isset($_POST['_curpasswd']) || !isset($_POST['_newpasswd']))
+      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
+    else {
+      $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST);
+      $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST);
+
+      if ($_SESSION['password'] != $rcmail->encrypt_passwd($curpwd))
+        $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
+      else if ($res = $this->_save($newpwd)) {
+        $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
+        $_SESSION['password'] = $rcmail->encrypt_passwd($newpwd);
+      } else
+        $rcmail->output->command('display_message', $this->gettext('errorsaving'), 'error');
+    }
+
+    rcmail_overwrite_action('plugin.password');
+    rcmail::get_instance()->output->send('plugin');
+  }
+
+  function password_form()
+  {
+    $rcmail = rcmail::get_instance();
+
+    // add some labels to client
+    $rcmail->output->add_label(
+	'password.nopassword',
+	'password.nocurpassword',
+        'password.passwordinconsistency',
+	'password.changepasswd'
+    );
+//    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+    $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
+
+    // allow the following attributes to be added to the <table> tag
+    $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+
+    // return the complete edit form as table
+    $out = '<table' . $attrib_str . ">\n\n";
+
+    $a_show_cols = array('curpasswd'   => array('type' => 'text'),
+                'newpasswd'   => array('type' => 'text'),
+                'confpasswd'   => array('type' => 'text'));
+
+    // show current password selection
+    $field_id = 'curpasswd';
+    $input_newpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, 'size' => 20));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                $field_id,
+                rep_specialchars_output($this->gettext('curpasswd')),
+                $input_newpasswd->show($rcmail->config->get('curpasswd')));
+
+    // show new password selection
+    $field_id = 'newpasswd';
+    $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id, 'size' => 20));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                $field_id,
+                rep_specialchars_output($this->gettext('newpasswd')),
+                $input_newpasswd->show($rcmail->config->get('newpasswd')));
+
+    // show confirm password selection
+    $field_id = 'confpasswd';
+    $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id, 'size' => 20));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                $field_id,
+                rep_specialchars_output($this->gettext('confpasswd')),
+                $input_confpasswd->show($rcmail->config->get('confpasswd')));
+
+    $out .= "\n</table>";
+
+    $out .= '<br />';
+    
+    $out .= $rcmail->output->button(array(
+	    'command' => 'plugin.password-save',
+	    'type' => 'input',
+	    'class' => 'button mainaction',
+	    'label' => 'save'
+    ));
+
+    $rcmail->output->add_gui_object('passform', 'password-form');
+
+    return $rcmail->output->form_tag(array(
+	'id' => 'password-form',
+	'name' => 'password-form',
+	'method' => 'post',
+	'action' => './?_task=settings&_action=plugin.password-save',
+	), $out);
+  }
+
+
+  private function _save($passwd)
+  {
+    $cfg = rcmail::get_instance()->config;
+
+    if (!($sql = $cfg->get('password_query')))
+      $sql = "SELECT update_passwd('%p', '%u')";
+        
+    $sql = str_replace('%u', $_SESSION['username'], $sql);
+    $sql = str_replace('%p', crypt($passwd), $sql);
+
+    if ($dsn = $cfg->get('db_passwd_dsn')) {
+      $db = new rcube_mdb2($dsn, '', FALSE);
+      $db->set_debug((bool)$cfg->get('sql_debug'));
+      $db->db_connect('w');
+    } else {
+      $db = rcmail::get_instance()->get_dbh();
+    }
+    
+    if (!$db->db_connected)
+      return false;
+    
+    $res = $db->query($sql);
+    $res = $db->fetch_array($res);
+
+    return $res;
+  }
+
+}
+
+?>