فهرست منبع

renamed occurrences of frequency to schedule

CauseFX 4 سال پیش
والد
کامیت
d5d97a9948
4فایلهای تغییر یافته به همراه16 افزوده شده و 16 حذف شده
  1. 7 7
      api/classes/organizr.class.php
  2. 1 1
      api/functions/option-functions.php
  3. 2 2
      api/v2/routes/connectionTester.php
  4. 6 6
      cron.php

+ 7 - 7
api/classes/organizr.class.php

@@ -6433,18 +6433,18 @@ class Organizr
 		return $query;
 	}
 	
-	public function testCronFrequency($frequency = null)
+	public function testCronSchedule($schedule = null)
 	{
-		if (is_array($frequency)) {
-			$frequency = str_replace('_', ' ', array_keys($frequency)[0]);
+		if (is_array($schedule)) {
+			$schedule = str_replace('_', ' ', array_keys($schedule)[0]);
 		}
-		if (!$frequency) {
-			$this->setResponse(409, 'Frequency was not supplied');
+		if (!$schedule) {
+			$this->setResponse(409, 'Schedule was not supplied');
 			return false;
 		}
 		try {
-			$frequency = new Cron\CronExpression($frequency);
-			$this->setResponse(200, 'Frequency was validated');
+			$schedule = new Cron\CronExpression($schedule);
+			$this->setResponse(200, 'Schedule was validated');
 			return true;
 		} catch (InvalidArgumentException $e) {
 			$this->setResponse(500, $e->getMessage());

+ 1 - 1
api/functions/option-functions.php

@@ -95,7 +95,7 @@ trait OptionsFunction
 			case 'cron':
 				$settingMerge = [
 					'type' => 'cron',
-					'label' => 'Cron Frequency',
+					'label' => 'Cron Schedule',
 					'help' => 'You may use either Cron format or - @hourly, @daily, @monthly',
 					'placeholder' => '* * * * *'
 				];

+ 2 - 2
api/v2/routes/connectionTester.php

@@ -582,7 +582,7 @@ $app->post('/test/cron', function ($request, $response, $args) {
 	 *     security={{ "api_key":{} }},
 	 *     tags={"test connection"},
 	 *     path="/api/v2/test/cron",
-	 *     summary="Test cron frequency",
+	 *     summary="Test cron schedule",
 	 *     @OA\Response(response="200",description="Success",@OA\JsonContent(ref="#/components/schemas/success-message")),
 	 *     @OA\Response(response="401",description="Unauthorized",@OA\JsonContent(ref="#/components/schemas/unauthorized-message")),
 	 *     @OA\Response(response="422",description="Error",@OA\JsonContent(ref="#/components/schemas/error-message")),
@@ -591,7 +591,7 @@ $app->post('/test/cron', function ($request, $response, $args) {
 	 */
 	$Organizr = ($request->getAttribute('Organizr')) ?? new Organizr();
 	if ($Organizr->qualifyRequest(1, true)) {
-		$Organizr->testCronFrequency($Organizr->apiData($request));
+		$Organizr->testCronSchedule($Organizr->apiData($request));
 	}
 	$response->getBody()->write(jsonE($GLOBALS['api']));
 	return $response

+ 6 - 6
cron.php

@@ -11,16 +11,16 @@ if ($Organizr->isLocalOrServer()) {
 	// Add plugin cron
 	$Organizr->logger->debug('Checking if any plugins have cron jobs');
 	foreach ($GLOBALS['cron'] as $cronJob) {
-		if (isset($cronJob['enabled']) && isset($cronJob['class']) && isset($cronJob['function']) && isset($cronJob['frequency'])) {
+		if (isset($cronJob['enabled']) && isset($cronJob['class']) && isset($cronJob['function']) && isset($cronJob['schedule'])) {
 			if ($Organizr->config[$cronJob['enabled']]) {
 				if (class_exists($cronJob['class'])) {
 					$Organizr->logger->debug('Starting cron job for function: ' . $cronJob['function'], ['cronJob' => $cronJob]);
-					$Organizr->logger->debug('Validating cron job frequency', ['frequency' => $cronJob['frequency']]);
+					$Organizr->logger->debug('Validating cron job schedule', ['schedule' => $cronJob['schedule']]);
 					try {
-						$frequency = new Cron\CronExpression($Organizr->config[$cronJob['frequency']]);
-						$Organizr->logger->debug('Cron frequency has passed validation', ['frequency' => $Organizr->config[$cronJob['frequency']]]);
+						$schedule = new Cron\CronExpression($Organizr->config[$cronJob['schedule']]);
+						$Organizr->logger->debug('Cron schedule has passed validation', ['schedule' => $Organizr->config[$cronJob['schedule']]]);
 					} catch (InvalidArgumentException $e) {
-						$Organizr->logger->warn('Cron frequency has failed validation', ['frequency' => $Organizr->config[$cronJob['frequency']]]);
+						$Organizr->logger->warn('Cron schedule has failed validation', ['schedule' => $Organizr->config[$cronJob['schedule']]]);
 						$Organizr->logger->error($e);
 						break;
 					}
@@ -37,7 +37,7 @@ if ($Organizr->isLocalOrServer()) {
 									'output' => $output,
 								]);
 							})
-							->at($Organizr->config[$cronJob['frequency']]);
+							->at($Organizr->config[$cronJob['schedule']]);
 					}
 				}
 			} else {