Merge pull request #502 from humhub/enh/360-replace-theme-variables

Replace theme variables with CSS variables
humhub · Sep 12, 2024 · 1e5b780 · 1e5b780
2 parents 5e389c4 + c396234
commit 1e5b780
Show file tree

Hide file tree

Showing 64 changed files with 376 additions and 376 deletions.
diff --git a/Events.php b/Events.php
@@ -199,7 +199,7 @@ public static function onWallEntryLinks($event)
         try {
             $eventModel = static::getCalendarEvent($event->sender->object);
 
-            if(!$eventModel) {
+            if (!$eventModel) {
                 return;
             }
 
@@ -208,11 +208,11 @@ public static function onWallEntryLinks($event)
             }
 
             /* @var $eventModel CalendarEventIF */
-            if($eventModel->getStartDateTime() <= new DateTime()) {
+            if ($eventModel->getStartDateTime() <= new DateTime()) {
                 return;
             }
 
-            if($eventModel instanceof CalendarEventReminderIF && !RecurrenceHelper::isRecurrentRoot($eventModel)) {
+            if ($eventModel instanceof CalendarEventReminderIF && !RecurrenceHelper::isRecurrentRoot($eventModel)) {
                 $event->sender->addWidget(ReminderLink::class, ['entry' => $eventModel]);
             }
         } catch (\Throwable $e) {
@@ -226,13 +226,13 @@ public static function onWallEntryLinks($event)
      */
     private static function getCalendarEvent($model)
     {
-        if($model instanceof CalendarEventIF) {
+        if ($model instanceof CalendarEventIF) {
             return $model;
         }
 
-        if(method_exists($model, 'getCalendarEvent')) {
+        if (method_exists($model, 'getCalendarEvent')) {
             $event = $model->getCalendarEvent();
-            if($event instanceof CalendarEventIF) {
+            if ($event instanceof CalendarEventIF) {
                 return $event;
             }
         }
@@ -253,9 +253,9 @@ public static function onRecordBeforeUpdate($event)
     {
         try {
             $model = CalendarUtils::getCalendarEvent($event->sender);
-            if($model && ($model instanceof EditableEventIF)) {
+            if ($model && ($model instanceof EditableEventIF)) {
                 /** @var $model EditableEventIF **/
-                if(empty($model->getUid())) {
+                if (empty($model->getUid())) {
                     $model->setUid(CalendarUtils::generateEventUid($model));
                 }
             }
@@ -274,17 +274,17 @@ public static function onRecordBeforeDelete($event)
         try {
             $model = CalendarUtils::getCalendarEvent($event->sender);
 
-            if(!$model || !($model instanceof CalendarEventReminderIF)) {
+            if (!$model || !($model instanceof CalendarEventReminderIF)) {
                 return;
             }
 
-            foreach(CalendarReminder::getEntryLevelReminder($model) as $reminder) {
+            foreach (CalendarReminder::getEntryLevelReminder($model) as $reminder) {
                 $reminder->delete();
             }
 
-            if($model instanceof RecurrentEventIF) {
+            if ($model instanceof RecurrentEventIF) {
                 // When deleting duplicates we want to prevent automatic exdate settings.
-                if(!static::$duplicateIntegrityRun) {
+                if (!static::$duplicateIntegrityRun) {
                     $model->getRecurrenceQuery()->onDelete();
                 }
             }
@@ -317,7 +317,7 @@ public static function onIntegrityCheck($event)
         $integrityController->showTestHeadline("Calendar Module (" . CalendarReminderSent::find()->count() . " reminder sent entries)");
 
         foreach (CalendarReminderSent::find()->each() as $reminderSent) {
-            if(!Content::findOne(['id' => $reminderSent->content_id])) {
+            if (!Content::findOne(['id' => $reminderSent->content_id])) {
                 if ($integrityController->showFix("Delete calendar reminder sent" . $reminderSent->id . " without existing entry relation!")) {
                     $reminderSent->delete();
                 }
@@ -339,7 +339,7 @@ public static function onIntegrityCheck($event)
                 ->andWhere(['<>', 'id', $duplicatedRecurrenceArr['id']]);
 
             foreach ($duplicateQuery->each() as $duplicate) {
-                if(RecurrenceHelper::isRecurrentInstance($duplicate) && $duplicate->id !== $duplicatedRecurrenceArr['id']) {
+                if (RecurrenceHelper::isRecurrentInstance($duplicate) && $duplicate->id !== $duplicatedRecurrenceArr['id']) {
                     if ($integrityController->showFix('Delete duplicated recurrent event instance ' . $duplicate->id . '!')) {
                         $duplicate->hardDelete();
                     }
@@ -370,7 +370,7 @@ public static function onCronRun($event)
         $module = Yii::$app->getModule('calendar');
         $lastRunTS = $module->settings->get('lastReminderRunTS');
 
-        if(!$lastRunTS || ((time() - $lastRunTS) >= $module->getRemidnerProcessIntervalS())) {
+        if (!$lastRunTS || ((time() - $lastRunTS) >= $module->getRemidnerProcessIntervalS())) {
             try {
                 $controller = $event->sender;
                 $controller->stdout("Running reminder process... ");

diff --git a/controllers/AbstractConfigController.php b/controllers/AbstractConfigController.php
@@ -95,14 +95,14 @@ public function actionDeleteType($id)
 
     public function actionEditType($id = null)
     {
-        if($id) {
+        if ($id) {
             $model = CalendarEntryType::find()->where(['id' => $id])->one();
             $this->validateEntry($model);
         } else {
             $model = new CalendarEntryType($this->contentContainer);
         }
 
-        if($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
             $this->view->saved();
             return $this->htmlRedirect(URL::toConfigTypes($this->contentContainer ?? $this->getContainerFromRequest()));
         }
@@ -123,11 +123,11 @@ public function actionEditCalendars($key)
     {
         $item = $this->calendarService->getItemType($key, $this->contentContainer);
 
-        if(!$item) {
+        if (!$item) {
             throw new HttpException(404);
         }
 
-        if($item->load(Yii::$app->request->post()) && $item->save()) {
+        if ($item->load(Yii::$app->request->post()) && $item->save()) {
             $this->view->saved();
             return $this->htmlRedirect(URL::toConfigCalendars($this->contentContainer));
         }
@@ -155,11 +155,11 @@ public function actionResetParticipationConfig()
 
     protected function validateEntry(CalendarEntryType $type = null)
     {
-        if(!$type) {
+        if (!$type) {
             throw new HttpException(404);
         }
 
-        if($type->contentcontainer_id !== $this->getContentContainerId()) {
+        if ($type->contentcontainer_id !== $this->getContentContainerId()) {
             throw new HttpException(400);
         }
     }

diff --git a/controllers/FullCalendarController.php b/controllers/FullCalendarController.php
@@ -29,11 +29,11 @@ public function actionUpdate($id)
 
         $content = Content::findOne(['id' => $id]);
 
-        if(!$content) {
+        if (!$content) {
             throw new HttpException(404);
         }
 
-        if(!$content->canEdit()) {
+        if (!$content->canEdit()) {
             throw new HttpException(403);
         }
 
@@ -42,25 +42,25 @@ public function actionUpdate($id)
 
         $event = CalendarUtils::getCalendarEvent($model);
 
-        if(!$event) {
+        if (!$event) {
             throw new HttpException(400, 'Invalid model given.');
         }
 
-        if(!$event->isUpdatable()) {
+        if (!$event->isUpdatable()) {
             throw new HttpException(400, 'Event can not be updated by current user.');
         }
 
         $start = new DateTime(Yii::$app->request->post('start'));
         $end = new DateTime(Yii::$app->request->post('end'));
 
-        if(!$event->isAllDay()) {
+        if (!$event->isAllDay()) {
             $start->setTimezone(CalendarUtils::getSystemTimeZone());
             $end->setTimezone(CalendarUtils::getSystemTimeZone());
         }
 
         $result = $event->updateTime($start, $end);
 
-        if(is_bool($result)) {
+        if (is_bool($result)) {
             return $this->asJson(['success' => $result]);
         }
 

diff --git a/controllers/ReminderController.php b/controllers/ReminderController.php
@@ -40,23 +40,23 @@ public function actionSet($id)
     {
         $content = Content::findOne(['id' => $id]);
 
-        if(!$content) {
+        if (!$content) {
             throw new HttpException(404);
         }
 
-        if(!$content->canView()) {
+        if (!$content->canView()) {
             throw new HttpException(403);
         }
 
         $model = CalendarUtils::getCalendarEvent($content);
 
-        if(!$model || !($model instanceof CalendarEventReminderIF)) {
+        if (!$model || !($model instanceof CalendarEventReminderIF)) {
             throw new HttpException(400);
         }
 
         $reminderSettings = new ReminderSettings(['entry' => $model, 'user' => Yii::$app->user->getIdentity()]);
 
-        if($reminderSettings->load(Yii::$app->request->post()) && $reminderSettings->save()) {
+        if ($reminderSettings->load(Yii::$app->request->post()) && $reminderSettings->save()) {
             return ModalClose::widget(['saved' => true]);
         }
 

diff --git a/controllers/rest/CalendarController.php b/controllers/rest/CalendarController.php
@@ -86,7 +86,7 @@ public function actionUpdate($id)
         }
 
         $calendarEntryForm = new CalendarEntryForm(['entry' => $calendarEntry]);
-        if(! $calendarEntryForm->entry->content->canEdit()) {
+        if (! $calendarEntryForm->entry->content->canEdit()) {
             return $this->returnError(403, 'You are not allowed to update this calendar entry!');
         }
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.6.4 (Unreleased)
+-----------------------
+- Enh #502: Replace theme variables with CSS variables
+
 1.6.3 (August 23, 2024)
 -----------------------
 - Fix #477: Hide the settings button when module is not available for a container