From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mailuser/mail_user_password_edit.php |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/interface/web/mailuser/mail_user_password_edit.php b/interface/web/mailuser/mail_user_password_edit.php
index 22eea89..07a1925 100644
--- a/interface/web/mailuser/mail_user_password_edit.php
+++ b/interface/web/mailuser/mail_user_password_edit.php
@@ -38,8 +38,8 @@
 * End Form configuration
 ******************************************/
 
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
 
 //* Check permissions for module
 $app->auth->check_module_permissions('mailuser');
@@ -49,24 +49,25 @@
 $app->load('tform_actions');
 
 class page_action extends tform_actions {
-	
+
 	function onSubmit() {
-		
-		$this->id = $_SESSION['s']['user']['mailuser_id'];
-		
-		parent::onSubmit();
-		
-	}
-	
-	function onShowEnd() {
 		global $app, $conf;
 		
+		$this->id = $app->functions->intval($_SESSION['s']['user']['mailuser_id']);
+
+		parent::onSubmit();
+
+	}
+
+	function onShowEnd() {
+		global $app, $conf;
+
 		$rec = $app->tform->getDataRecord($_SESSION['s']['user']['mailuser_id']);
 		$app->tpl->setVar("email", $rec['email']);
-		
+
 		parent::onShowEnd();
 	}
-	
+
 }
 
 $app->tform_actions = new page_action;

--
Gitblit v1.9.1