From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 23 Apr 2006 13:24:51 +0000 (+0000)
Subject: removing code that could be used with plugin in SM 1.4.x. After init
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=567d419923235fe370ba4f18ce762f70d6dcae82;hp=4588f43defbad726d307820e8126cf8cabc886ca

removing code that could be used with plugin in SM 1.4.x. After init
changes plugin is no longer compatible with sm 1.4.x


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11076 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/plugins/change_password/options.php b/plugins/change_password/options.php
index 4400a015..d4c8659a 100644
--- a/plugins/change_password/options.php
+++ b/plugins/change_password/options.php
@@ -53,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();
 
@@ -67,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');
 ?>
 
diff --git a/plugins/change_password/setup.php b/plugins/change_password/setup.php
index 1b43b9b3..10c2fed9 100644
--- a/plugins/change_password/setup.php
+++ b/plugins/change_password/setup.php
@@ -29,24 +29,12 @@ function squirrelmail_plugin_init_change_password() {
 function change_password_optpage() {
     global $optpage_blocks;
 
-    // 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');
-    }
-
     $optpage_blocks[] = array(
         'name' => _("Change Password"),
         'url' => '../plugins/change_password/options.php',
         'desc' => _("Use this to change your email password."),
         'js' => FALSE
     );
-
-    // SM14 code: revert to squirrelmail domain for 1.4.x
-    if (! check_sm_version(1,5,0)) {
-        bindtextdomain('squirrelmail',SM_PATH . 'locale');
-        textdomain('squirrelmail');
-    }
 }
 
 /**
@@ -56,20 +44,8 @@ function change_password_optpage() {
 function change_password_loadinfo() {
     global $optpage, $optpage_name;
     if ($optpage=='change_password') {
-        // 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');
-        }
-
         // i18n: is displayed after "Successfully Saved Options:"
         $optpage_name=_("User's Password");
-
-        // SM14 code: revert to squirrelmail domain for 1.4.x
-        if (! check_sm_version(1,5,0)) {
-            bindtextdomain('squirrelmail',SM_PATH . 'locale');
-            textdomain('squirrelmail');
-        }
     }
 }