X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fchange_password%2Fbackend%2Fvmailmgrd.php;h=93dd474c4d8574752b2d716922382a9a7324724f;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hp=47909eeac16c2bd652768acd94565ab8524d38e2;hpb=760630169b355181586bd6e286c2cffe2d15a9c6;p=squirrelmail.git diff --git a/plugins/change_password/backend/vmailmgrd.php b/plugins/change_password/backend/vmailmgrd.php index 47909eea..93dd474c 100644 --- a/plugins/change_password/backend/vmailmgrd.php +++ b/plugins/change_password/backend/vmailmgrd.php @@ -1,4 +1,5 @@ + * @author Tomas Kuliavas + * @copyright 2005-2020 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @link http://www.vmailmgr.org vmailmgr site * @package plugins @@ -101,24 +104,13 @@ $squirrelmail_plugin_hooks['change_password_init']['vmailmgrd'] = * is displayed to the user. */ function cpw_vmailmgrd_init(){ - global $vmail_inc_path, $color, $username; - - /** - * If SM_PATH isn't defined, define it. Required to include files. - * @ignore - */ - if (!defined('SM_PATH')) { - define('SM_PATH','../../../'); - } - - // load error_box() function - include_once(SM_PATH . 'functions/display_messages.php'); + global $vmail_inc_path, $username, $oTemplate; if ($vmail_inc_path=='' || ! file_exists($vmail_inc_path)) { // $vmail_inc_path is not set or file does not exist - error_box(_("Incorrent path to vmail.inc file."),$color); + error_box(_("Incorrent path to vmail.inc file.")); // close html and stop script execution - echo "\n"; + $oTemplate->display('footer.tpl'); exit(); } @@ -126,17 +118,17 @@ function cpw_vmailmgrd_init(){ if (! function_exists('vchpass')) { // included vmail.inc does not have required functions. - error_box(_("Invalid or corrupted vmail.inc file."),$color); + error_box(_("Invalid or corrupted vmail.inc file.")); // close html and stop script execution - echo "\n"; + $oTemplate->display('footer.tpl'); exit(); } if (! preg_match("/(.*)\@(.*)/", $username)) { // username does not match vmailmgr syntax - error_box(_("Invalid user."),$color); + error_box(_("Invalid user.")); // close html and stop script execution - echo "\n"; + $oTemplate->display('footer.tpl'); exit(); } } @@ -212,7 +204,7 @@ function cpw_vmailmgrd_passwd($user,$domain,$oldpass,$newpass) { } /** - * Function is used to translate messages returned by vmailmgr + * Function is used to translate messages returned by vmailmgr * php library and vmailmgr daemon. * @param string $string vmailmrgd message. * @return string translated string. @@ -294,4 +286,3 @@ function cpw_i18n_vmail_response($string) { } return $ret; } -?> \ No newline at end of file