From bfd0857b3ea0f3a13ea1411a5d6a8155fa9a2b7f Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 29 Jan 2017 12:01:24 +0100
Subject: [PATCH] Fix select in add.php, lower error_reporting in vars

---
 data/web/add.php          | 36 +++++++++++++-----------------------
 data/web/inc/vars.inc.php |  4 ++--
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/data/web/add.php b/data/web/add.php
index 0bc7496b..9758a3cd 100644
--- a/data/web/add.php
+++ b/data/web/add.php
@@ -57,6 +57,13 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
 						<input type="number" class="form-control" name="quota" id="quota" value="10240">
 						</div>
 					</div>
+          <hr>
+					<div class="form-group">
+						<label class="control-label col-sm-2" for="virtual_transport">Use relay transport</label>
+						<div class="col-sm-10">
+						<input type="test" class="form-control" name="virtual_transport" id="virtual_transport" placeholder="smtp.gmail.com">
+						</div>
+					</div>
 					<div class="form-group">
 						<label class="control-label col-sm-2"><?=$lang['add']['backup_mx_options'];?></label>
 						<div class="col-sm-10">
@@ -132,29 +139,12 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
 					<div class="form-group">
 						<label class="control-label col-sm-2" for="target_domain"><?=$lang['add']['target_domain'];?></label>
 						<div class="col-sm-10">
-							<select name="target_domain" id="target_domain" title="<?=$lang['add']['select'];?>">
-								<?php
-								try {
-									$stmt = $pdo->prepare("SELECT `domain` FROM `domain`
-											WHERE `domain` IN (
-													SELECT `domain` FROM `domain_admins`
-															WHERE `username`= :username
-															AND `active`='1'
-													)
-											OR 'admin' = :admin");
-									$stmt->execute(array(':username' => $_SESSION['mailcow_cc_username'], ':admin' => $_SESSION['mailcow_cc_role']));
-									$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-								}
-								catch(PDOException $e) {
-									$_SESSION['return'] = array(
-										'type' => 'danger',
-										'msg' => 'MySQL: '.$e
-									);
-								}
-								while ($row = array_shift($rows)) {
-										echo "<option>".htmlspecialchars($row['domain'])."</option>";
-								}
-								?>
+							<select name="target_domain" id="target_domain" title="<?=$lang['add']['select'];?>" required>
+							<?php
+              foreach (mailbox_get_domains() as $domain) {
+								echo "<option>".htmlspecialchars($domain)."</option>";
+							}
+							?>
 							</select>
 						</div>
 					</div>
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 4570f818..60235451 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -1,6 +1,6 @@
 <?php
-// error_reporting(E_ERROR | E_WARNING);
-error_reporting(E_ALL);
+error_reporting(E_ERROR | E_WARNING);
+//error_reporting(E_ALL);
 
 /*
 PLEASE USE THE FILE "vars.local.inc.php" TO OVERWRITE SETTINGS AND MAKE THEM PERSISTENT!