Account for extra fields in address book more correctly. Also account for no global...

[squirrelmail.git] / plugins / change_password / options.php

diff --git a/plugins/change_password/options.php b/plugins/change_password/options.php
index 0246bfa59fccd38d86f25c2a53580c9a8e0c61e6..d4c8659aad3a6be7c692be843ee78cb349680a58 100644 (file)
--- a/plugins/change_password/options.php
+++ b/plugins/change_password/options.php
@@ -10,10 +10,11 @@
  * @subpackage change_password
  */
 
-/** @ignore */
-define('SM_PATH','../../');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
 
-include_once (SM_PATH . 'include/validate.php');
 include_once (SM_PATH . 'plugins/change_password/functions.php');
 include_once (SM_PATH . 'functions/forms.php');
 
@@ -52,13 +53,6 @@ if (file_exists(SM_PATH . 'plugins/change_password/backend/'.$cpw_backend.'.php'
 
 /* the form was submitted, go for it */
 if(sqgetGlobalVar('cpw_go', $cpw_go, SQ_POST)) {
-
-    // SM14 code: use change_password gettext domain binding for 1.4.x
-    if (! check_sm_version(1,5,0)) {
-        bindtextdomain('change_password',SM_PATH . 'locale');
-        textdomain('change_password');
-    }
-
     /* perform basic checks */
     $Messages = cpw_check_input();
 
@@ -66,22 +60,10 @@ if(sqgetGlobalVar('cpw_go', $cpw_go, SQ_POST)) {
     if(count($Messages) == 0) {
         $Messages = cpw_do_change();
     }
-
-    // SM14 code: use change_password gettext domain binding for 1.4.x
-    if (! check_sm_version(1,5,0)) {
-        bindtextdomain('squirrelmail',SM_PATH . 'locale');
-        textdomain('squirrelmail');
-    }
 }
 
 displayPageHeader($color, 'None');
 
-// SM14 code: use change_password gettext domain binding for 1.4.x
-if (! check_sm_version(1,5,0)) {
-    bindtextdomain('change_password',SM_PATH . 'locale');
-    textdomain('change_password');
-}
-
 do_hook('change_password_init');
 ?>