Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev
This commit is contained in:
		@@ -21,7 +21,7 @@ open my $file, '<', "/etc/sogo/sieve.creds";
 | 
				
			|||||||
my $creds = <$file>; 
 | 
					my $creds = <$file>; 
 | 
				
			||||||
close $file;
 | 
					close $file;
 | 
				
			||||||
my ($master_user, $master_pass) = split /:/, $creds;
 | 
					my ($master_user, $master_pass) = split /:/, $creds;
 | 
				
			||||||
my $sth = $dbh->prepare("SELECT id, user1, user2, host1, authmech1, password1, exclude, port1, enc1, delete2duplicates, maxage, subfolder2, delete1 FROM imapsync WHERE active = 1 AND (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(last_run) > mins_interval * 60 OR last_run IS NULL)");
 | 
					my $sth = $dbh->prepare("SELECT id, user1, user2, host1, authmech1, password1, exclude, port1, enc1, delete2duplicates, maxage, subfolder2, delete1 FROM imapsync WHERE active = 1 AND (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(last_run) > mins_interval * 60 OR last_run IS NULL) ORDER BY last_run");
 | 
				
			||||||
$sth->execute();
 | 
					$sth->execute();
 | 
				
			||||||
my $row;
 | 
					my $row;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user