Imported Upstream version 3.1

diff --git a/change_pass.pot b/change_pass.pot
new file mode 100644 (file)
index 0000000..da10755
--- /dev/null
+++ b/change_pass.pot
@@ -0,0 +1,75 @@
+# <your language> SquirrelMail change_pass Plugin Translation File
+# Copyright (C) 2009 The SquirrelMail Development Team
+# This file is distributed under the same license as the SquirrelMail package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: change_pass\n"
+"Report-Msgid-Bugs-To: SquirrelMail Internationalization <squirrelmail-i18n@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2009-05-09 11:25-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: SquirrelMail Language Team <squirrelmail-i18n@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: functions.php:13 options.php:86
+msgid "Change Password"
+msgstr ""
+
+#: functions.php:35
+#, c-format
+msgid "Connection error: %s"
+msgstr ""
+
+#: options.php:108
+msgid "Current Password:"
+msgstr ""
+
+#: options.php:112
+msgid "New Password:"
+msgstr ""
+
+#: functions.php:56
+msgid "Password change was not successful!"
+msgstr ""
+
+#: functions.php:15
+msgid "Use this to change your email password."
+msgstr ""
+
+#: functions.php:138
+msgid "User's Password"
+msgstr ""
+
+#: options.php:116
+msgid "Verify New Password:"
+msgstr ""
+
+#: options.php:52
+msgid "You must also type in your new password in the verify box."
+msgstr ""
+
+#: options.php:48
+msgid "You must type in a new password."
+msgstr ""
+
+#: options.php:44
+msgid "You must type in your current password."
+msgstr ""
+
+#: options.php:69
+msgid "Your current password is not correct."
+msgstr ""
+
+#: options.php:57
+msgid "Your new password does not match the verify password."
+msgstr ""
+
+#: options.php:61
+#, c-format
+msgid "Your new password should be %s to %s characters long."
+msgstr ""

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5c46220..88dbe51 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,8 @@
-$Id: ChangeLog,v 1.2 2009/05/09 17:35:38 indiri69 Exp $
+$Id: ChangeLog,v 1.3 2009/12/09 00:29:58 indiri69 Exp $
+* Tue Dec  8 2009 Seth Randall <indiri69@users.sourceforge.net>
+- Updated version number to 3.1
+- Added support for smtoken
+

 * Sat May  9 2009 Seth Randall <indiri69@users.sourceforge.net>
 - Code cleanups and changes
 - Updated version number to 3.0
 * Sat May  9 2009 Seth Randall <indiri69@users.sourceforge.net>
 - Code cleanups and changes
 - Updated version number to 3.0

diff --git a/doc/INSTALL b/doc/INSTALL
index 53ef501..d7baa4a 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -4,11 +4,14 @@ Installing change_pass
    The functionality it provides is already included in the
    change_password plugin that is part of 1.5.x.
 
    The functionality it provides is already included in the
    change_password plugin that is part of 1.5.x.
 

+   This plugin requires SquirrelMail 1.4.20 or later (or 1.4.0+ and
+   Compatibility 2.0.16).
+

 1) Start with untaring the file into the plugins directory.
 1) Start with untaring the file into the plugins directory.

-   Here is an example for the 3.0 version of the change_pass plugin.
+   Here is an example for the 3.1 version of the change_pass plugin.

 
   $ cd plugins
 
   $ cd plugins

-  $ tar -zxf change_pass-3.0-1.4.0.tar.gz
+  $ tar -zxf change_pass-3.1-1.4.0.tar.gz

 
 2) By default, the plugin will connect to the IMAP server configured
    for SquirrelMail on port 106 to change passwords.
 
 2) By default, the plugin will connect to the IMAP server configured
    for SquirrelMail on port 106 to change passwords.

@@ -49,11 +52,7 @@ Installing change_pass
   $ cd ../../../../config/
   $ ./conf.pl
 
   $ cd ../../../../config/
   $ ./conf.pl
 

-4) If not being used with SquirrelMail 1.4.16+,
-   please verify that you have the "Compatibility" plugin
-   installed (but not necessarily activated).
-
-5) Translations are not included in this package.  To get a
+4) Translations are not included in this package.  To get a

    translation, download the language pack needed from:
 
        http://www.squirrelmail.org/download.php
    translation, download the language pack needed from:
 
        http://www.squirrelmail.org/download.php

diff --git a/doc/README b/doc/README
index 92d644c..6e68ccd 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1,6 +1,6 @@
 change_pass plugin for SquirrelMail
 ===================================
 change_pass plugin for SquirrelMail
 ===================================

-Version 3.0, 2009/05/09
+Version 3.1, 2009/05/09

 
 Ritchie Low
 Tyler Akins
 
 Ritchie Low
 Tyler Akins

diff --git a/functions.php b/functions.php
index 28ed9c2..20afc9e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2,7 +2,7 @@
 /*
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
 /*
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *

- * $Id: functions.php,v 1.7 2009/05/14 02:33:01 indiri69 Exp $
+ * $Id: functions.php,v 1.8 2009/12/09 00:21:11 indiri69 Exp $

  */
 
 function change_pass_option_link_do() {
  */
 
 function change_pass_option_link_do() {

@@ -59,7 +59,7 @@ function change_pass_dochange($change_pass_old, $change_pass_new, $debug = false
                                 change_pass_closeport($pop_socket, $debug);
                                 sqauth_save_password($change_pass_new);
                                 session_write_close();
                                 change_pass_closeport($pop_socket, $debug);
                                 sqauth_save_password($change_pass_new);
                                 session_write_close();

-                                header('Location: ' . sqm_baseuri() . 'src/options.php?optmode=submit&optpage=change_pass&plugin_change_pass=1');
+                                header('Location: ' . sqm_baseuri() . 'src/options.php?optmode=submit&optpage=change_pass&plugin_change_pass=1&smtoken=' . sm_generate_security_token());

                                 exit;
                             }
                         }
                                 exit;
                             }
                         }

@@ -105,20 +105,20 @@ function change_pass_info_real() {
                 'sm_site_username' => 'randall',
             ),
         ),
                 'sm_site_username' => 'randall',
             ),
         ),

-        'version' => '3.0',
+        'version' => '3.1',

         'required_sm_version' => '1.4.0',
         'requires_configuration' => 0,
         'requires_source_patch'  => 0,
         'required_plugins'       => array(),
         'per_version_requirements' => array(
             '1.5.0'  => SQ_INCOMPATIBLE,
         'required_sm_version' => '1.4.0',
         'requires_configuration' => 0,
         'requires_source_patch'  => 0,
         'required_plugins'       => array(),
         'per_version_requirements' => array(
             '1.5.0'  => SQ_INCOMPATIBLE,

-            '1.4.16' => array(
+            '1.4.20' => array(

                 'required_plugins' => array()
             ),
             '1.4.0'  => array(
                 'required_plugins' => array(
                     'compatibility' => array(
                 'required_plugins' => array()
             ),
             '1.4.0'  => array(
                 'required_plugins' => array(
                     'compatibility' => array(

-                        'version'  => '2.0.13',
+                        'version'  => '2.0.16',

                         'activate' => FALSE
                     )
                 )
                         'activate' => FALSE
                     )
                 )

diff --git a/options.php b/options.php
index 7649a3c..7bae346 100644 (file)
--- a/options.php
+++ b/options.php
@@ -3,7 +3,7 @@
 /*
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
 /*
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *

- * $Id: options.php,v 1.7 2009/05/05 03:09:22 indiri69 Exp $
+ * $Id: options.php,v 1.8 2009/12/09 00:21:11 indiri69 Exp $

  */
 
 define('SM_PATH', '../../');
  */
 
 define('SM_PATH', '../../');

@@ -13,6 +13,10 @@ require_once(SM_PATH . 'functions/forms.php');
 
 $debug = false;
 
 
 $debug = false;
 

+if(!sqgetGlobalVar('smtoken', $submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
+

 // Make sure the plugin is activated
 global $plugins;
 if(!in_array('change_pass', $plugins)) {
 // Make sure the plugin is activated
 global $plugins;
 if(!in_array('change_pass', $plugins)) {

@@ -35,6 +39,7 @@ $error_messages = array();
 $showform = true;
 
 if (isset($change_pass_form)) {
 $showform = true;
 
 if (isset($change_pass_form)) {

+    sm_validate_security_token($submitted_token, 3600, TRUE);

     sq_change_text_domain('change_pass');
     sqgetGlobalVar('change_pass_old', $change_pass_old, SQ_POST);
     sqgetGlobalVar('change_pass_new', $change_pass_new, SQ_POST);
     sq_change_text_domain('change_pass');
     sqgetGlobalVar('change_pass_old', $change_pass_old, SQ_POST);
     sqgetGlobalVar('change_pass_new', $change_pass_new, SQ_POST);

@@ -101,7 +106,8 @@ if(count($error_messages) > 0) {
 }
 
 if($showform) {
 }
 
 if($showform) {

-    echo addForm($PHP_SELF);
+    echo addForm(sqm_baseuri() . 'plugins/change_pass/options.php');
+    echo addHidden('smtoken', sm_generate_security_token());

     echo
         html_tag('table', "\n" .
             html_tag('tr', "\n" .
     echo
         html_tag('table', "\n" .
             html_tag('tr', "\n" .

diff --git a/version b/version
index c553e1c..ee0a156 100644 (file)
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
 Change Password
 Change Password

-3.0
+3.1