Fixed #6798

Author: cknost

interface/web/mail/mail_user_edit.php

@@ -344,13 +344,15 @@ function onAfterInsert() {
 
 
 		// Set the fields for dovecot
-		$disableimap = ($this->dataRecord["disableimap"])?'y':'n';
-		$disablepop3 = ($this->dataRecord["disablepop3"])?'y':'n';
-		$disablesmtp = ($this->dataRecord["disablesmtp"])?'y':'n';
-		$disabledeliver = ($this->dataRecord["disabledeliver"])?'y':'n';
-
-		$sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?";
-		$app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id);
+		if(isset($this->dataRecord["email"])) {
+			$disableimap = ($this->dataRecord["disableimap"]) ? 'y' : 'n';
+			$disablepop3 = ($this->dataRecord["disablepop3"]) ? 'y' : 'n';
+			$disablesmtp = ($this->dataRecord["disablesmtp"]) ? 'y' : 'n';
+			$disabledeliver = ($this->dataRecord["disabledeliver"]) ? 'y' : 'n';
+
+			$sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?";
+			$app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id);
+		}
 	}
 
 	function onAfterUpdate() {
@@ -363,13 +365,15 @@ function onAfterUpdate() {
 		}
 
 		// Set the fields for dovecot
-		$disableimap = (isset($this->dataRecord["disableimap"]) && $this->dataRecord["disableimap"])?'y':'n';
-		$disablepop3 = (isset($this->dataRecord["disablepop3"]) && $this->dataRecord["disablepop3"])?'y':'n';
-		$disablesmtp = (isset($this->dataRecord["disablesmtp"]) && $this->dataRecord["disablesmtp"])?'y':'n';
-		$disabledeliver = (isset($this->dataRecord["disabledeliver"]) && $this->dataRecord["disabledeliver"])?'y':'n';
-
-		$sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, `disablesieve-filter` = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?";
-		$app->db->query($sql, $disableimap, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id);
+		if(isset($this->dataRecord["email"])) {
+			$disableimap = (isset($this->dataRecord["disableimap"]) && $this->dataRecord["disableimap"]) ? 'y' : 'n';
+			$disablepop3 = (isset($this->dataRecord["disablepop3"]) && $this->dataRecord["disablepop3"]) ? 'y' : 'n';
+			$disablesmtp = (isset($this->dataRecord["disablesmtp"]) && $this->dataRecord["disablesmtp"]) ? 'y' : 'n';
+			$disabledeliver = (isset($this->dataRecord["disabledeliver"]) && $this->dataRecord["disabledeliver"]) ? 'y' : 'n';
+
+			$sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, `disablesieve-filter` = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?";
+			$app->db->query($sql, $disableimap, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id);
+		}
 
 		// Spamfilter policy
 		$policy_id = $app->functions->intval($this->dataRecord["policy"]);