Merge pull request #2602 from phili67/phili67-php-code-cleanup

php code cleanup
phili67 · Apr 11, 2024 · 20d95f8 · 20d95f8
2 parents b20eeb3 + a8ba533
commit 20d95f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/src/EcclesiaCRM/Service/CalendarService.php b/src/EcclesiaCRM/Service/CalendarService.php
@@ -22,21 +22,13 @@
 use EcclesiaCRM\UserQuery;
 use EcclesiaCRM\EventCountsQuery;
 
-use EcclesiaCRM\Map\EventTableMap;
-use EcclesiaCRM\Map\EventTypesTableMap;
-use EcclesiaCRM\Map\GroupTableMap;
-
-use EcclesiaCRM\Map\CalendarinstancesTableMap;
-use EcclesiaCRM\Map\PrincipalsTableMap;
 use EcclesiaCRM\dto\SystemConfig;
 use EcclesiaCRM\EventAttend;
 use EcclesiaCRM\EventCounts;
 
 use EcclesiaCRM\SessionUser;
 use EcclesiaCRM\Utils\GeoUtils;
-use EcclesiaCRM\Utils\LoggerUtils;
 use EcclesiaCRM\Utils\MiscUtils;
-use http\Client\Curl\User;
 use Propel\Runtime\ActiveQuery\Criteria;
 use EcclesiaCRM\dto\SystemURLs;
 use EcclesiaCRM\Utils\OutputUtils;
@@ -968,7 +960,7 @@ public function removeEventFromCalendar($calendarID, $eventID, $reccurenceID = n
     public function modifyEventFromCalendar($calendarID, $eventID, $reccurenceID, $start, $end, $EventTitle,
                                             $EventDesc, $location, $addGroupAttendees, $alarm, $eventTypeID,
                                             $eventNotes, $eventInActive, $Fields, $EventCountNotes, $recurrenceValid, $recurrenceType,
-                                            $endrecurrence, $allDay)
+                                            $endrecurrence, $allDay = false)
     {
         $old_event = EventQuery::Create()->findOneById($eventID);
 

diff --git a/src/EcclesiaCRM/Service/PastoralCareService.php b/src/EcclesiaCRM/Service/PastoralCareService.php
@@ -84,8 +84,6 @@ public function getRange()
     public function getPersonClassificationNotBeenReached($yet = false)
     {
         if (!$yet) {
-            $pdo = Propel::getConnection();
-
             // TO DO : convert query to propel (complex).
 
             $sSQL = "SELECT family_fam.fam_Name AS LastName,

diff --git a/src/EcclesiaCRM/dto/Notification.php b/src/EcclesiaCRM/dto/Notification.php
@@ -59,7 +59,7 @@ private function sendEmail()
       $email = new NotificationEmail($emailaddresses,$this->person->getFullName());
       $emailStatus=$email->send();
       return $emailStatus;
-    } catch (Exception $ex) {
+    } catch (\Exception $ex) {
       return false;
     }
 
@@ -81,7 +81,7 @@ private function sendSMS()
           ]);
         }
         return $message;
-      } catch (Exception $ex) {
+      } catch (\Exception $ex) {
         return false;
       }
 
@@ -96,7 +96,7 @@ private function sendProjector()
                 SystemConfig::getValue("sOLPPassword"));
         $OLPAlert->setAlertText($this->projectorText);
         return $OLPAlert->send();
-      } catch (Exception $ex) {
+      } catch (\Exception $ex) {
         return false;
       }