fix unlimited db quota message

jnorell · jnorell · commit c0069d7aa813 · 2018-08-09T15:05:39.000-06:00
diff --git a/server/lib/classes/cron.d/100-monitor_database_size.inc.php b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
@@ -95,7 +95,7 @@ public function onRunJob() {
 				if(!is_numeric($quota)) continue;
 				
 				if($quota < 1 || $quota > $data[$i]['size']) {
-					print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . $quota . ' (quota) > ' . $data[$i]['size'] . " (used)\n";
+					print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . ($quota < 1 ? 'unlimited' : $quota) . ' (quota) > ' . $data[$i]['size'] . " (used)\n";
 					if($rec['quota_exceeded'] == 'y') {
 						$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);
 					}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function onRunJob() {`
`95`	`95`	`if(!is_numeric($quota)) continue;`
`96`	`96`
`97`	`97`	`if($quota < 1 \|\| $quota > $data[$i]['size']) {`
`98`		`- print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . $quota . ' (quota) > ' . $data[$i]['size'] . " (used)\n";`
	`98`	`+ print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . ($quota < 1 ? 'unlimited' : $quota) . ' (quota) > ' . $data[$i]['size'] . " (used)\n";`
`99`	`99`	`if($rec['quota_exceeded'] == 'y') {`
`100`	`100`	`$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);`
`101`	`101`	`}`