fixing a small thing wher eusers could update theyr username to other users usernames

app-code/api/account/update_user_data.php

@@ -43,7 +43,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     }
 
     // Sanitize and validate the input
-    $name = preg_replace("/[^a-zA-Z0-9_]/", "", $data['name']); // Allow only letters, numbers, and underscores
+    $name = strtolower(preg_replace("/[^a-zA-Z0-9_]/", "", $data['name']));
     $email = trim((string) $data['email']);
     if ($email !== "" && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
         echo json_encode([
@@ -52,7 +52,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         ]);
         exit();
     }
-    $telegram_id = htmlspecialchars($data['telegram_id'], ENT_QUOTES, 'UTF-8'); // Escape special characters
+    $telegram_id = htmlspecialchars($data['telegram_id'], ENT_QUOTES, 'UTF-8');
 
     //check if username is allready taken
     $id_check=0;
@@ -63,8 +63,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     mysqli_stmt_store_result($stmt);
     mysqli_stmt_bind_result($stmt, $id_check);
     mysqli_stmt_fetch($stmt);
-    if(mysqli_stmt_num_rows($stmt) > 0 && $username!==$name){
+    if((mysqli_stmt_num_rows($stmt) > 0 && $username!==$name) || $name === ""){
-	//this username is allready taken
 	echo json_encode([
             'success' => false,
             'message' => 'Username allready taken. Please choose another username.'

app-code/api/login/send_reset_link.php

@@ -35,7 +35,6 @@ if (!$user_found) {
 }
 //send telegram message
 $device = $_SERVER['HTTP_USER_AGENT'] ?? "";
-//$ip=$_SERVER["REMOTE_ADDR"];
 $forwarded_for = $_SERVER["HTTP_X_FORWARDED_FOR"] ?? $_SERVER["REMOTE_ADDR"] ?? "";
 $ip=trim(explode(",",$forwarded_for)[0]);
 $location=get_location_from_ip($ip);
@@ -44,15 +43,20 @@ $token=bin2hex(random_bytes(128));
 $token_hash=auth_token_hash($token);
 $link="https://auth.jakach.ch/login/reset_pw.php?token=$token";
 
+$tg_device = str_replace(['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'], ['\\_', '\\*', '\\[', '\\]', '\\(', '\\)', '\\~', '\\`', '\\>', '\\#', '\\+', '\\-', '\\=', '\\|', '\\{', '\\}', '\\.', '\\!'], $device);
+$tg_username = str_replace(['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'], ['\\_', '\\*', '\\[', '\\]', '\\(', '\\)', '\\~', '\\`', '\\>', '\\#', '\\+', '\\-', '\\=', '\\|', '\\{', '\\}', '\\.', '\\!'], $_SESSION["username"]);
+$tg_ip = str_replace(['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'], ['\\_', '\\*', '\\[', '\\]', '\\(', '\\)', '\\~', '\\`', '\\>', '\\#', '\\+', '\\-', '\\=', '\\|', '\\{', '\\}', '\\.', '\\!'], $ip);
+$tg_location = str_replace(['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'], ['\\_', '\\*', '\\[', '\\]', '\\(', '\\)', '\\~', '\\`', '\\>', '\\#', '\\+', '\\-', '\\=', '\\|', '\\{', '\\}', '\\.', '\\!'], ($location["country"] ?? "").", ".($location["state"] ?? "").", ".($location["city"] ?? ""));
+
 $message = "*Password reset token*\n\n"
     . "You have requested the reset of your password here is your reset link.\n\n"
     . "*Link*: [click here]($link)\n\n"
     . "*Details of this request:*\n"
     . "• *Date&Time*: $date\n"
-    . "• *Device&Browser*: $device\n"
+    . "• *Device&Browser*: $tg_device\n"
-    . "*Location*: ".$location["country"].", ".$location["state"].", ".$location["city"]."\n"
+    . "*Location*: $tg_location\n"
-    . "• *Account*: ".$_SESSION["username"]."\n"
+    . "• *Account*: $tg_username\n"
-    . "• *IP*: $ip\n\n"
+    . "• *IP*: $tg_ip\n\n"
     ."If this was you, you can reset your password. If this was not you somebody else tried to reset your password!\n"
     . "*Thank you for using Jakach login!*";
 
@@ -78,6 +82,12 @@ curl_close($ch);
 //send mail
 if(!empty($mail)){
 	$loc=$location["country"].", ".$location["state"].", ".$location["city"];
+	$html_username = htmlspecialchars($username, ENT_QUOTES, 'UTF-8');
+	$html_device = htmlspecialchars($device, ENT_QUOTES, 'UTF-8');
+	$html_ip = htmlspecialchars($ip, ENT_QUOTES, 'UTF-8');
+	$html_loc = htmlspecialchars($loc, ENT_QUOTES, 'UTF-8');
+	$html_mail = htmlspecialchars($mail, ENT_QUOTES, 'UTF-8');
+	$html_link = htmlspecialchars($link, ENT_QUOTES, 'UTF-8');
 	$content = '
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -89,433 +99,67 @@ if(!empty($mail)){
     <meta name="supported-color-schemes" content="light dark" />
     <title></title>
     <style type="text/css" rel="stylesheet" media="all">
-    /* Base ------------------------------ */
-    
     @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
-    body {
+    body { width:100% !important; height:100%; margin:0; -webkit-text-size-adjust:none; }
-      width: 100% !important;
+    a { color:#3869D4; }
-      height: 100%;
+    a img { border:none; }
-      margin: 0;
+    td { word-break:break-word; }
-      -webkit-text-size-adjust: none;
+    .preheader { display:none !important; visibility:hidden; mso-hide:all; font-size:1px; line-height:1px; max-height:0; max-width:0; opacity:0; overflow:hidden; }
-    }
+    body, td, th { font-family:"Nunito Sans",Helvetica,Arial,sans-serif; }
-    
+    h1 { margin-top:0; color:#333333; font-size:22px; font-weight:bold; text-align:left; }
-    a {
+    h2 { margin-top:0; color:#333333; font-size:16px; font-weight:bold; text-align:left; }
-      color: #3869D4;
+    h3 { margin-top:0; color:#333333; font-size:14px; font-weight:bold; text-align:left; }
-    }
+    td, th { font-size:16px; }
-    
+    p, ul, ol, blockquote { margin:.4em 0 1.1875em; font-size:16px; line-height:1.625; }
-    a img {
+    p.sub { font-size:13px; }
-      border: none;
+    .align-right { text-align:right; }
-    }
+    .align-left { text-align:left; }
-    
+    .align-center { text-align:center; }
-    td {
+    .u-margin-bottom-none { margin-bottom:0; }
-      word-break: break-word;
+    .button { background-color:#3869D4; border-top:10px solid #3869D4; border-right:18px solid #3869D4; border-bottom:10px solid #3869D4; border-left:18px solid #3869D4; display:inline-block; color:#FFF; text-decoration:none; border-radius:3px; box-shadow:0 2px 3px rgba(0,0,0,0.16); -webkit-text-size-adjust:none; box-sizing:border-box; }
-    }
+    .button--green { background-color:#22BC66; border-top:10px solid #22BC66; border-right:18px solid #22BC66; border-bottom:10px solid #22BC66; border-left:18px solid #22BC66; }
-    
+    .button--red { background-color:#FF6136; border-top:10px solid #FF6136; border-right:18px solid #FF6136; border-bottom:10px solid #FF6136; border-left:18px solid #FF6136; }
-    .preheader {
+    @media only screen and (max-width:500px) { .button { width:100% !important; text-align:center !important; } }
-      display: none !important;
+    .attributes { margin:0 0 21px; }
-      visibility: hidden;
+    .attributes_content { background-color:#F4F4F7; padding:16px; }
-      mso-hide: all;
+    .attributes_item { padding:0; }
-      font-size: 1px;
+    .related { width:100%; margin:0; padding:25px 0 0 0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; }
-      line-height: 1px;
+    .related_item { padding:10px 0; color:#CBCCCF; font-size:15px; line-height:18px; }
-      max-height: 0;
+    .related_item-title { display:block; margin:.5em 0 0; }
-      max-width: 0;
+    .related_item-thumb { display:block; padding-bottom:10px; }
-      opacity: 0;
+    .related_heading { border-top:1px solid #CBCCCF; text-align:center; padding:25px 0 10px; }
-      overflow: hidden;
+    .discount { width:100%; margin:0; padding:24px; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; background-color:#F4F4F7; border:2px dashed #CBCCCF; }
-    }
+    .discount_heading { text-align:center; }
-    /* Type ------------------------------ */
+    .discount_body { text-align:center; font-size:15px; }
-    
+    .social { width:auto; }
-    body,
+    .social td { padding:0; width:auto; }
-    td,
+    .social_icon { height:20px; margin:0 8px 10px 8px; padding:0; }
-    th {
+    .purchase { width:100%; margin:0; padding:35px 0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; }
-      font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+    .purchase_content { width:100%; margin:0; padding:25px 0 0 0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; }
-    }
+    .purchase_item { padding:10px 0; color:#51545E; font-size:15px; line-height:18px; }
-    
+    .purchase_heading { padding-bottom:8px; border-bottom:1px solid #EAEAEC; }
-    h1 {
+    .purchase_heading p { margin:0; color:#85878E; font-size:12px; }
-      margin-top: 0;
+    .purchase_footer { padding-top:15px; border-top:1px solid #EAEAEC; }
-      color: #333333;
+    .purchase_total { margin:0; text-align:right; font-weight:bold; color:#333333; }
-      font-size: 22px;
+    .purchase_total--label { padding:0 15px 0 0; }
-      font-weight: bold;
+    body { background-color:#F2F4F6; color:#51545E; }
-      text-align: left;
+    p { color:#51545E; }
-    }
+    .email-wrapper { width:100%; margin:0; padding:0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; background-color:#F2F4F6; }
-    
+    .email-content { width:100%; margin:0; padding:0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; }
-    h2 {
+    .email-masthead { padding:25px 0; text-align:center; }
-      margin-top: 0;
+    .email-masthead_logo { width:94px; }
-      color: #333333;
+    .email-masthead_name { font-size:16px; font-weight:bold; color:#A8AAAF; text-decoration:none; text-shadow:0 1px 0 white; }
-      font-size: 16px;
+    .email-body { width:100%; margin:0; padding:0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; }
-      font-weight: bold;
+    .email-body_inner { width:570px; margin:0 auto; padding:0; -premailer-width:570px; -premailer-cellpadding:0; -premailer-cellspacing:0; background-color:#FFFFFF; }
-      text-align: left;
+    .email-footer { width:570px; margin:0 auto; padding:0; -premailer-width:570px; -premailer-cellpadding:0; -premailer-cellspacing:0; text-align:center; }
-    }
+    .email-footer p { color:#A8AAAF; }
-    
+    .body-action { width:100%; margin:30px auto; padding:0; -premailer-width:100%; -premailer-cellpadding:0; -premailer-cellspacing:0; text-align:center; }
-    h3 {
+    .body-sub { margin-top:25px; padding-top:25px; border-top:1px solid #EAEAEC; }
-      margin-top: 0;
+    .content-cell { padding:45px; }
-      color: #333333;
+    @media only screen and (max-width:600px) { .email-body_inner, .email-footer { width:100% !important; } }
-      font-size: 14px;
+    @media (prefers-color-scheme:dark) { body,.email-body,.email-body_inner,.email-content,.email-wrapper,.email-masthead,.email-footer { background-color:#333333 !important; color:#FFF !important; } p,ul,ol,blockquote,h1,h2,h3,span,.purchase_item { color:#FFF !important; } .attributes_content,.discount { background-color:#222 !important; } .email-masthead_name { text-shadow:none !important; } }
-      font-weight: bold;
+    :root { color-scheme:light dark; supported-color-schemes:light dark; }
-      text-align: left;
-    }
-    
-    td,
-    th {
-      font-size: 16px;
-    }
-    
-    p,
-    ul,
-    ol,
-    blockquote {
-      margin: .4em 0 1.1875em;
-      font-size: 16px;
-      line-height: 1.625;
-    }
-    
-    p.sub {
-      font-size: 13px;
-    }
-    /* Utilities ------------------------------ */
-    
-    .align-right {
-      text-align: right;
-    }
-    
-    .align-left {
-      text-align: left;
-    }
-    
-    .align-center {
-      text-align: center;
-    }
-    
-    .u-margin-bottom-none {
-      margin-bottom: 0;
-    }
-    /* Buttons ------------------------------ */
-    
-    .button {
-      background-color: #3869D4;
-      border-top: 10px solid #3869D4;
-      border-right: 18px solid #3869D4;
-      border-bottom: 10px solid #3869D4;
-      border-left: 18px solid #3869D4;
-      display: inline-block;
-      color: #FFF;
-      text-decoration: none;
-      border-radius: 3px;
-      box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
-      -webkit-text-size-adjust: none;
-      box-sizing: border-box;
-    }
-    
-    .button--green {
-      background-color: #22BC66;
-      border-top: 10px solid #22BC66;
-      border-right: 18px solid #22BC66;
-      border-bottom: 10px solid #22BC66;
-      border-left: 18px solid #22BC66;
-    }
-    
-    .button--red {
-      background-color: #FF6136;
-      border-top: 10px solid #FF6136;
-      border-right: 18px solid #FF6136;
-      border-bottom: 10px solid #FF6136;
-      border-left: 18px solid #FF6136;
-    }
-    
-    @media only screen and (max-width: 500px) {
-      .button {
-        width: 100% !important;
-        text-align: center !important;
-      }
-    }
-    /* Attribute list ------------------------------ */
-    
-    .attributes {
-      margin: 0 0 21px;
-    }
-    
-    .attributes_content {
-      background-color: #F4F4F7;
-      padding: 16px;
-    }
-    
-    .attributes_item {
-      padding: 0;
-    }
-    /* Related Items ------------------------------ */
-    
-    .related {
-      width: 100%;
-      margin: 0;
-      padding: 25px 0 0 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .related_item {
-      padding: 10px 0;
-      color: #CBCCCF;
-      font-size: 15px;
-      line-height: 18px;
-    }
-    
-    .related_item-title {
-      display: block;
-      margin: .5em 0 0;
-    }
-    
-    .related_item-thumb {
-      display: block;
-      padding-bottom: 10px;
-    }
-    
-    .related_heading {
-      border-top: 1px solid #CBCCCF;
-      text-align: center;
-      padding: 25px 0 10px;
-    }
-    /* Discount Code ------------------------------ */
-    
-    .discount {
-      width: 100%;
-      margin: 0;
-      padding: 24px;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #F4F4F7;
-      border: 2px dashed #CBCCCF;
-    }
-    
-    .discount_heading {
-      text-align: center;
-    }
-    
-    .discount_body {
-      text-align: center;
-      font-size: 15px;
-    }
-    /* Social Icons ------------------------------ */
-    
-    .social {
-      width: auto;
-    }
-    
-    .social td {
-      padding: 0;
-      width: auto;
-    }
-    
-    .social_icon {
-      height: 20px;
-      margin: 0 8px 10px 8px;
-      padding: 0;
-    }
-    /* Data table ------------------------------ */
-    
-    .purchase {
-      width: 100%;
-      margin: 0;
-      padding: 35px 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .purchase_content {
-      width: 100%;
-      margin: 0;
-      padding: 25px 0 0 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .purchase_item {
-      padding: 10px 0;
-      color: #51545E;
-      font-size: 15px;
-      line-height: 18px;
-    }
-    
-    .purchase_heading {
-      padding-bottom: 8px;
-      border-bottom: 1px solid #EAEAEC;
-    }
-    
-    .purchase_heading p {
-      margin: 0;
-      color: #85878E;
-      font-size: 12px;
-    }
-    
-    .purchase_footer {
-      padding-top: 15px;
-      border-top: 1px solid #EAEAEC;
-    }
-    
-    .purchase_total {
-      margin: 0;
-      text-align: right;
-      font-weight: bold;
-      color: #333333;
-    }
-    
-    .purchase_total--label {
-      padding: 0 15px 0 0;
-    }
-    
-    body {
-      background-color: #F2F4F6;
-      color: #51545E;
-    }
-    
-    p {
-      color: #51545E;
-    }
-    
-    .email-wrapper {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #F2F4F6;
-    }
-    
-    .email-content {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    /* Masthead ----------------------- */
-    
-    .email-masthead {
-      padding: 25px 0;
-      text-align: center;
-    }
-    
-    .email-masthead_logo {
-      width: 94px;
-    }
-    
-    .email-masthead_name {
-      font-size: 16px;
-      font-weight: bold;
-      color: #A8AAAF;
-      text-decoration: none;
-      text-shadow: 0 1px 0 white;
-    }
-    /* Body ------------------------------ */
-    
-    .email-body {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .email-body_inner {
-      width: 570px;
-      margin: 0 auto;
-      padding: 0;
-      -premailer-width: 570px;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #FFFFFF;
-    }
-    
-    .email-footer {
-      width: 570px;
-      margin: 0 auto;
-      padding: 0;
-      -premailer-width: 570px;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      text-align: center;
-    }
-    
-    .email-footer p {
-      color: #A8AAAF;
-    }
-    
-    .body-action {
-      width: 100%;
-      margin: 30px auto;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      text-align: center;
-    }
-    
-    .body-sub {
-      margin-top: 25px;
-      padding-top: 25px;
-      border-top: 1px solid #EAEAEC;
-    }
-    
-    .content-cell {
-      padding: 45px;
-    }
-    /*Media Queries ------------------------------ */
-    
-    @media only screen and (max-width: 600px) {
-      .email-body_inner,
-      .email-footer {
-        width: 100% !important;
-      }
-    }
-    
-    @media (prefers-color-scheme: dark) {
-      body,
-      .email-body,
-      .email-body_inner,
-      .email-content,
-      .email-wrapper,
-      .email-masthead,
-      .email-footer {
-        background-color: #333333 !important;
-        color: #FFF !important;
-      }
-      p,
-      ul,
-      ol,
-      blockquote,
-      h1,
-      h2,
-      h3,
-      span,
-      .purchase_item {
-        color: #FFF !important;
-      }
-      .attributes_content,
-      .discount {
-        background-color: #222 !important;
-      }
-      .email-masthead_name {
-        text-shadow: none !important;
-      }
-    }
-    
-    :root {
-      color-scheme: light dark;
-      supported-color-schemes: light dark;
-    }
     </style>
-    <!--[if mso]>
-    <style type="text/css">
-      .f-fallback  {
-        font-family: Arial, sans-serif;
-      }
-    </style>
-  <![endif]-->
   </head>
   <body>
     <span class="preheader">Use this link to reset your password. The link is only valid for 12 hours.</span>
@@ -525,31 +169,24 @@ if(!empty($mail)){
           <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
             <tr>
               <td class="email-masthead">
-                <a href="https://auth.jakach.ch" class="f-fallback email-masthead_name">
+                <a href="https://auth.jakach.ch" class="f-fallback email-masthead_name">Jakach Login</a>
-                Jakach Login
-              </a>
               </td>
             </tr>
-            <!-- Email Body -->
             <tr>
               <td class="email-body" width="570" cellpadding="0" cellspacing="0">
                 <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-                  <!-- Body content -->
                   <tr>
                     <td class="content-cell">
                       <div class="f-fallback">
-                        <h1>Hi '.$username.',</h1>
+                        <h1>Hi '.$html_username.',</h1>
                         <p>You recently requested to reset your password for your Jakach login account. Use the button below to reset it. <strong>This password reset is only valid for the next 12 hours.</strong></p>
-                        <!-- Action -->
                         <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
                           <tr>
                             <td align="center">
-                              <!-- Border based button
-           https://litmus.com/blog/a-guide-to-bulletproof-buttons-in-email-design -->
                               <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
                                 <tr>
                                   <td align="center">
-                                    <a href="'.$link.'" class="f-fallback button button--green" target="_blank">Reset your password</a>
+                                    <a href="'.$html_link.'" class="f-fallback button button--green" target="_blank">Reset your password</a>
                                   </td>
                                 </tr>
                               </table>
@@ -559,19 +196,17 @@ if(!empty($mail)){
                         <p><strong>Request Details:</strong></p>
         			<ul>
         			    <li><strong>Date & Time:</strong> '.$date.'</li>
-        			    <li><strong>Device & Browser:</strong> '.$device.'</li>
+        			    <li><strong>Device & Browser:</strong> '.$html_device.'</li>
-        			    <li><strong>Account:</strong> '.$mail.'</li>
+        			    <li><strong>Account:</strong> '.$html_mail.'</li>
-        			    <li><strong>IP Address:</strong> '.$ip.'</li>
+        			    <li><strong>IP Address:</strong> '.$html_ip.'</li>
-        			    <li><strong>Location:</strong> '.$loc.'</li>
+        			    <li><strong>Location:</strong> '.$html_loc.'</li>
         			</ul>
-                        <p>Thanks,
+                        <p>Thanks,<br>The Jakach login team</p>
-                          <br>The Jakach login team</p>
-                        <!-- Sub copy -->
                         <table class="body-sub" role="presentation">
                           <tr>
                             <td>
-                              <p class="f-fallback sub">If you’re having trouble with the button above, copy and paste the URL below into your web browser.</p>
+                              <p class="f-fallback sub">If you are having trouble with the button above, copy and paste the URL below into your web browser.</p>
-                              <p class="f-fallback sub">'.$link.'</p>
+                              <p class="f-fallback sub">'.$html_link.'</p>
                             </td>
                           </tr>
                         </table>
@@ -586,10 +221,7 @@ if(!empty($mail)){
                 <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
                   <tr>
                     <td class="content-cell" align="center">
-                      <p class="f-fallback sub align-center">
+                      <p class="f-fallback sub align-center">Jakach.ch<br>CH-Switzerland.</p>
-                        Jakach.ch
-                        <br>CH-Switzerland.
-                      </p>
                     </td>
                   </tr>
                 </table>