From 94a4580661b771e465f752ef190853c2da228e7e Mon Sep 17 00:00:00 2001
From: udera <udera@aspekte.net>
Date: Sat, 15 Apr 2017 21:48:49 +0000
Subject: [PATCH] Move forwarding-js-code from inline to external script-file

---
 vexim/adminuserchange.php | 23 +++---------------
 vexim/scripts.js          | 49 ++++++++++++++++++++++++++++++++++++---
 vexim/userchange.php      | 10 +++-----
 3 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/vexim/adminuserchange.php b/vexim/adminuserchange.php
index a53a45bc..ba0d2c62 100644
--- a/vexim/adminuserchange.php
+++ b/vexim/adminuserchange.php
@@ -30,25 +30,8 @@
     <title><?php echo _('Virtual Exim') . ': ' . _('Manage Users'); ?></title>
     <link rel="stylesheet" href="style.css" type="text/css">
     <script src="scripts.js" type="text/javascript"></script>
-    <script type='text/javascript'>
-      function fwac() {
-      document.getElementById('forward').disabled = !document.getElementById('on_forward').checked;
-      document.getElementById('forwardmenu').disabled = !document.getElementById('on_forward').checked;
-      }
-      function boxadd() {
-        var exstring = document.getElementById('forward').value;
-        var box = document.getElementById('forwardmenu');
-        var selectitem = box.options[box.selectedIndex].value;
-        if (!exstring.match(/\S/)) {
-          document.getElementById('forward').value=selectitem;
-        } else {
-          document.getElementById('forward').value += "," + selectitem;
-        }
-      }
-
-    </script>
   </head>
-  <body onLoad="fwac()">
+  <body>
   <?php include dirname(__FILE__) . '/config/header.php'; ?>
     <div id="Menu">
       <a href="adminuser.php"><?php echo _('Manage Accounts'); ?></a><br>
@@ -279,7 +262,7 @@ function boxadd() {
           <td><input name="on_forward" id="on_forward" type="checkbox" <?php
             if ($row['on_forward'] == "1") {
               print " checked";
-            } ?> onchange="fwac()" onclick="fwac()">
+            } ?>>
           </td>
         </tr>
         <tr>
@@ -289,7 +272,7 @@ function boxadd() {
             value="<?php print $row['forward']; ?>" class="textfield"><br>
             <?php echo _('Enter full e-mail addresses, use commas to separate them'); ?>!<br>
             <?php echo _('or select from this list') .":<br>\n"; ?>
-            <select name="forwardmenu" id="forwardmenu" onchange="boxadd()">
+            <select name="forwardmenu" id="forwardmenu">
               <option selected value=""></option>
               <?php
                 $queryuserlist = "SELECT realname, username, user_id, unseen
diff --git a/vexim/scripts.js b/vexim/scripts.js
index ed3248cd..07498e73 100644
--- a/vexim/scripts.js
+++ b/vexim/scripts.js
@@ -46,9 +46,52 @@ function copyPassword(sourceFieldName, target1FieldName, target2FieldName) {
 
 
 /**
- * Add event listener for buttons on the password generator form
+ * Enables forward-destination field and selection box only if forwarding is enabled
+ */
+function fwform() {
+    document.getElementById('forward').disabled = !document.getElementById('on_forward').checked;
+    if (document.getElementById('forwardmenu') != null) { //userchange.php has no box
+      document.getElementById('forwardmenu').disabled = !document.getElementById('on_forward').checked;
+    }
+    return true;
+}
+
+
+/**
+ * If item on forwarding destination is selected from a list of destinations
+ * the forwarding text box is updated
+ */
+function boxadd() {
+    var exstring = document.getElementById('forward').value;
+    var box = document.getElementById('forwardmenu');
+    var selectitem = box.options[box.selectedIndex].value;
+    if (!exstring.match(/\S/)) {
+      document.getElementById('forward').value=selectitem;
+    } else {
+      document.getElementById('forward').value += "," + selectitem;
+    }
+}
+
+
+/**
+ * Add event listener
  */
 document.addEventListener('DOMContentLoaded', function () {
-  document.getElementById('pwcopy').addEventListener('click', function() { copyPassword('suggest', 'clear', 'vclear')});
-  document.getElementById('pwgenerate').addEventListener('click', function() { suggestPassword('suggest')});
+    if (document.getElementById('pwcopy') != null) {
+      document.getElementById('pwcopy').addEventListener('click', function() { copyPassword('suggest', 'clear', 'vclear')});
+    }
+    if (document.getElementById('pwgenerate') != null) {
+      document.getElementById('pwgenerate').addEventListener('click', function() { suggestPassword('suggest') });
+    }
+    if (document.getElementById('on_forward') != null) {
+      document.getElementById('on_forward').addEventListener('change', function() { fwform() });
+    }
+    if (document.getElementById('forwardmenu') != null) {
+    document.getElementById('forwardmenu').addEventListener('change', function() { boxadd() });
+    }
+
+    // settings at page load
+    if (document.getElementById('forward') != null) {
+      fwform();
+    }
 });
diff --git a/vexim/userchange.php b/vexim/userchange.php
index 60319d3e..0d1231b5 100644
--- a/vexim/userchange.php
+++ b/vexim/userchange.php
@@ -23,13 +23,9 @@
   <head>
     <title><?php echo _("Virtual Exim") . ": " . _("Manage Users"); ?></title>
     <link rel="stylesheet" href="style.css" type="text/css">
-    <script type='text/javascript'>
-      function fwac() {
-      document.getElementById('forward').disabled = !document.getElementById('on_forward').checked;
-      }
-    </script>
+    <script src="scripts.js" type="text/javascript"></script>
   </head>
-  <body onLoad="fwac()">
+  <body>
     <?php include dirname(__FILE__) . "/config/header.php"; ?>
     <div id="Menu">
       <a href="logout.php"><?php echo _("Logout"); ?></a><br>
@@ -131,7 +127,7 @@ function fwac() {
   	  </tr>
   	  <tr><td><?php echo _("Forwarding enabled"); ?>:</td>
   	    <td><input name="on_forward" type="checkbox" id="on_forward"
-          <?php if($row['on_forward'] == "1") { print " checked "; } ?> onchange="fwac()" onclick="fwac()">
+          <?php if($row['on_forward'] == "1") { print " checked "; } ?>>
           </td></tr>
   	  <tr><td><?php echo _("Forward mail to");?>:</td>
 	    <td><input type="text" name="forward" id="forward" value="<?php print $row['forward']; ?>" class="textfield"><br>
