Merge pull request #682 from Leantime/fixes

Fixes
Leantime · Apr 16, 2022 · 34cd54a · 34cd54a
2 parents 254094b + f74cb3d
commit 34cd54a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/core/class.login.php b/src/core/class.login.php
@@ -275,7 +275,7 @@ private function login()
             ////C: update users from the identity provider
 
             //Try Ldap
-            if($this->config->useLdap === true){
+            if($this->config->useLdap === true && extension_loaded('ldap')){
 
                 $ldap = new ldap();
 
@@ -642,7 +642,7 @@ private function getUser($username)
 
         }
 
-        private function generateLinkAndSendEmail($username)
+        public function generateLinkAndSendEmail($username)
         {
 
             $permitted_chars = '0123456789abcdefghijklmnopqrstuvwxyz';

diff --git a/src/core/class.mailer.php b/src/core/class.mailer.php
@@ -66,9 +66,9 @@ public function __construct()
             $this->from = $config->email;
 
             //PHPMailer
-            $this->mailAgent = new PHPMailer();
+            $this->mailAgent = new PHPMailer(true);
 
-	    $this->mailAgent->CharSet = 'UTF-8';                    //Ensure UTF-8 is used for emails
+	        $this->mailAgent->CharSet = 'UTF-8';                    //Ensure UTF-8 is used for emails
 
             //Use SMTP or php mail().
             if($config->useSMTP === true) {
@@ -214,8 +214,15 @@ public function sendMail(array $to, $from)
             $to = array_unique($to);
 
             foreach ($to as $recip) {
-                $this->mailAgent->addAddress($recip);
-                $this->mailAgent->send();
+
+                try {
+                    $this->mailAgent->addAddress($recip);
+                    $this->mailAgent->send();
+                }catch(Exception $e){
+                    error_log($this->mailAgent->ErrorInfo);
+                    error_log($e->getMessage());
+                }
+
                 $this->mailAgent->clearAllRecipients();
             }
 

diff --git a/src/domain/projects/templates/submodules/projectDetails.sub.php b/src/domain/projects/templates/submodules/projectDetails.sub.php
@@ -130,7 +130,7 @@ class="fa fa-money-bill-alt"></span><?php echo $this->__('label.budgets'); ?></h
 		</h4>
 	</div>
 
-	<div class="row-fluid  padding-top">
+	<div class="row-fluid  padding-top" style="display:none;">
 		<div class="span8">
 			<div class="form-group">
 

diff --git a/src/domain/tickets/controllers/class.editMilestone.php b/src/domain/tickets/controllers/class.editMilestone.php
@@ -61,6 +61,11 @@ public function get($params)
                     $this->tpl->redirect(BASE_URL."/tickets/roadmap/");
                 }
 
+                //Ensure this ticket belongs to the current project
+                if($_SESSION["currentProject"] != $milestone->projectId) {
+                    $this->projectService->changeCurrentSessionProject($milestone->projectId);
+                }
+
                 $comments = $this->commentsService->getComments('ticket', $params['id']);
 
             }else{

diff --git a/src/domain/users/controllers/class.newUser.php b/src/domain/users/controllers/class.newUser.php
@@ -55,10 +55,6 @@ public function run()
 						$values['clientId'] = core\login::getUserClientId();
 					}
 
-					//Validation
-					//print_r($_POST);
-					# exit();
-
 					if ($values['user'] !== '') {
 						if ($_POST['password'] == $_POST['password2']) {
 							if (filter_var($values['user'], FILTER_VALIDATE_EMAIL)) {