Fix multiple small bugs (hestiacp#2052)

* Issue with jQuery + Add user page

* Use name of user instead "Hestia control user"

* Update changelog

Author: jaapmarcus

CHANGELOG.md

@@ -10,8 +10,10 @@ All notable changes to this project will be documented in this file.
 
 ### Bugfixes
 
-- Fixed UI issues after upgrade jQuery + jQuery UI to last version (#2021 and #2032)
+- Fixed UI issues after upgrade jQuery + jQuery UI to last version (#2021 and #2032) + [forum](https://forum.hestiacp.com/t/confusion-about-send-welcome-email-checkbox/4259/11)
 - Fixed security issues in caching templates of Nginx when used as Reverse Proxy
+- Fixed an issue with deleting multiple mail accounts (#2047)
+- Fixed an issue with phpmailer + non latin characters (#2050) thanks @Faymir 
 
 ## [1.4.9] - Service release 
 

web/add/user/index.php

@@ -114,7 +114,7 @@
         }
 
         $mailtext .= sprintf(_('ACCOUNT_READY'),$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']);
-        send_email($to, $subject, $mailtext, $from, $from_name);
+        send_email($to, $subject, $mailtext, $from, $from_name, $_POST['name']);
         putenv("LANGUAGE=".detect_user_language());
     }
 

web/inc/main.php

@@ -294,8 +294,7 @@ function get_percentage($used,$total) {
     return $percent;
 }
 
-function send_email($to, $subject, $mailtext, $from, $from_name) {
-
+function send_email($to, $subject, $mailtext, $from, $from_name, $to_name = '') {
     $mail = new PHPMailer();
 
     if (isset($_SESSION['USE_SERVER_SMTP']) && $_SESSION['USE_SERVER_SMTP'] == "true") {
@@ -314,7 +313,11 @@ function send_email($to, $subject, $mailtext, $from, $from_name) {
 
     $mail->IsHTML(true);
     $mail->ClearReplyTos();
-    $mail->AddAddress($to, "Hestia Control Panel User");
+    if (empty($to_name)){
+        $mail->AddAddress($to);
+    }else{
+        $mail->AddAddress($to, $to_name);
+    }
     $mail->SetFrom($from, $from_name);
 
     $mail->CharSet = "utf-8";

web/js/init.js

@@ -198,7 +198,7 @@ $(document).ready(function(){
                           }
                       }
                       else {
-                          if ($('.l-unit .ch-toggle:eq(0)').attr('checked')) {
+                          if ($('.l-unit .ch-toggle:eq(0)').prop('checked')) {
                                 $('.l-unit').removeClass('selected');
                                 $('.l-unit .ch-toggle').prop('checked', false);
                           }

web/js/jquery/jquery.finder.js

@@ -214,7 +214,7 @@
                   shortcut.add("Ctrl+a", function(evt){
                     if(jQuery('.ch-toggle:checked').length > 0) {
                       f.t.unHAll(p, o);
-                      jQuery('.ch-toggle:checked').attr('checked', false);
+                      jQuery('.ch-toggle:checked').prop('checked', false);
                     } else {
                       f.t.hAll(p,o);
                     }
@@ -231,7 +231,7 @@
                         //if(f.detect.alt(e)) {
                         if(jQuery('.ch-toggle:checked').length > 0) {
                             f.t.unHAll(p, o);
-                            jQuery('.ch-toggle:checked').attr('checked', false);
+                            jQuery('.ch-toggle:checked').prop('checked', false);
                         } else {
                             f.t.hAll(p,o);
                         }

web/js/pages/add_user.js

@@ -1,11 +1,11 @@
 $(function() {
     $('#v_email').change(function() {
-        if($('#v_email_notify').attr('checked')){
+        if($('#v_email_notify').prop('checked')){
             document.getElementById('v_notify').value = document.getElementById('v_email').value;
         }
     });
     $('#v_email_notify').change(function() {
-        if($('#v_email_notify').attr('checked')){
+        if($('#v_email_notify').prop('checked')){
             document.getElementById('v_notify').value = document.getElementById('v_email').value;
         }else{
             document.getElementById('v_notify').value = '';

web/js/pages/add_web.js

@@ -158,7 +158,7 @@ App.Actions.WEB.remove_ftp_user = function(elm) {
 
 
 App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
-    if ($(elm).attr('checked')) {
+    if ($(elm).prop('checked')) {
         $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').show();
         $('.ftptable-nrm').each(function(i, elm) {
             var login = $(elm).find('.v-ftp-user');
@@ -193,7 +193,7 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
 }
 
 App.Actions.WEB.toggle_letsencrypt = function(elm) {
-    if ($(elm).attr('checked')) {
+    if ($(elm).prop('checked')) {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
         $('#generate-csr').hide();
 	$('.lets-encrypt-note').show();

web/js/pages/edit_mail.js

@@ -1,5 +1,5 @@
 App.Actions.MAIL.toggle_letsencrypt = function(elm) {
-    if ($(elm).attr('checked')) {
+    if ($(elm).prop('checked')) {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
         $('#generate-csr').hide();
 	if(!$('.lets-encrypt-note').hasClass('enabled')){

web/js/pages/edit_web.js

@@ -294,9 +294,11 @@ function FTPrandom(elm) {
     App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
 }
 
-function elementHideShow(elementToHideOrShow){
-    var el = document.getElementById(elementToHideOrShow);
-    el.style.display = el.style.display === 'none' ? 'block' : 'none';
+function elementHideShow(element){
+    if ( document.getElementById(element)){
+        var el = document.getElementById(element);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+    }
 }
 
 $('.v-redirect-custom-value').change( function(){

web/reset/index.php

@@ -43,7 +43,7 @@
             }
             if (in_array(str_replace(':'.$_SERVER['SERVER_PORT'],'.conf',$_SERVER['HTTP_HOST']), array_merge(scandir('/etc/nginx/conf.d'),scandir('/etc/nginx/conf.d/domains'),scandir('/etc/apache2/conf.d/domains'),scandir('/etc/apache2/conf.d')))){
                 $mailtext .= sprintf(_('PASSWORD_RESET_REQUEST'),$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
-                if (!empty($rkey)) send_email($to, $subject, $mailtext, $from, $from_name);
+                if (!empty($rkey)) send_email($to, $subject, $mailtext, $from, $from_name, $data[$user]['NAME']);
                 header("Location: /reset/?action=code&user=".$_POST['user']);
                 exit;
             } else {