Fix email format - add nl2br see BT#11067

main/admin/user_edit.php

@@ -209,19 +209,19 @@ $form->addElement('text', 'phone', get_lang('PhoneNumber'));
 $form->addElement('file', 'picture', get_lang('AddPicture'), array('id' => 'picture', 'class' => 'picture-form'));
 $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
 
-$form->addHtml(''
-                . '<div class="form-group">'
-                    . '<label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label>'
-                        . '<div class="col-sm-8">'
-                            . '<div id="cropImage" class="cropCanvas">'
-                                . '<img id="previewImage" >'
-                            . '</div>'
-                            . '<div>'
-                                . '<button class="btn btn-primary hidden" name="cropButton" id="cropButton"><em class="fa fa-crop"></em> '.get_lang('CropYourPicture').'</button>'
-                            . '</div>'
-                        . '</div>'
-                . '</div>'
-    . '');
+$form->addHtml('<div class="form-group">
+    <label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label>
+    <div class="col-sm-8">
+        <div id="cropImage" class="cropCanvas">
+            <img id="previewImage" >
+        </div>
+        <div>
+        <button class="btn btn-primary hidden" name="cropButton" id="cropButton">
+        <em class="fa fa-crop"></em> '.get_lang('CropYourPicture').'</button>
+        </div>
+    </div>
+</div>');
+
 $form->addHidden('cropResult', '');
 
 $form->addRule(
@@ -402,7 +402,7 @@ if ($form->validate()) {
                 $_FILES['picture']['name'],
                 $_FILES['picture']['tmp_name'],
                 $user['cropResult']
-                    
+
             );
 		}
 

main/inc/lib/usermanager.lib.php

@@ -396,7 +396,7 @@ class UserManager
                         $url = api_get_access_url($access_url_id);
                     }
                 } else {
-                    $url = $_configuration['root_web'];
+                    $url = api_get_path(WEB_PATH);
                 }
                 $tplContent = new Template(null, false, false, false, false, false);
                 // variables for the default template
@@ -946,6 +946,8 @@ class UserManager
             } else {
                 $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ".$username.(($reset_password > 0) ? "\n".get_lang('Pass')." : ".stripslashes($original_password) : "")."\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".$_configuration['root_web']."\n\n".get_lang('Problem')."\n\n".get_lang('SignatureFormula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
             }
+
+            $emailbody = nl2br($emailbody);
             api_mail_html(
                 $recipient_name,
                 $email,

main/mySpace/user_edit.php

@@ -180,7 +180,8 @@ if ($form->validate()) {
                 api_get_setting('siteName')."\nT. ".
                 api_get_setting('administratorTelephone')."\n" .
                 get_lang('Email') ." : ".api_get_setting('emailAdministrator');
-
+            $emailbody = nl2br($emailbody);
+            
 			api_mail_html(
                 api_get_person_name($userInfo['firstname'], $userInfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS),
                 $email,

main/template/default/mail/reset_password.tpl

@@ -1,4 +1,4 @@
 <p>{{ 'Dear' }} {{ complete_user_name }}</p>
 <p>
-    {{ 'ResetPasswordCommentWithUrl'|get_lang|format(link) }}
+    {{ 'ResetPasswordCommentWithUrl'| get_lang | format(link) | nl2br }}
 </p>