Browse Source
			
			
			Remove CONFIG.email_invitation option
			
			
				pull/295/head
			
			
		 
		
			
				
					
						 Nick Fox
					
					7 years ago
						Nick Fox
					
					7 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 82719985805A7CA8
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
1 additions and 
3 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/api/core/organizations.rs
				
- 
					
					
					 
					src/main.rs
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -479,7 +479,7 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade | 
			
		
	
		
			
				
					|  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |         if CONFIG.email_invitations { | 
			
		
	
		
			
				
					|  |  |  |         if CONFIG.mail.is_some() { | 
			
		
	
		
			
				
					|  |  |  |             use crate::mail; | 
			
		
	
		
			
				
					|  |  |  |             use chrono::{Duration, Utc}; | 
			
		
	
		
			
				
					|  |  |  |             let time_now = Utc::now().naive_utc(); | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -271,7 +271,6 @@ pub struct Config { | 
			
		
	
		
			
				
					|  |  |  |     local_icon_extractor: bool, | 
			
		
	
		
			
				
					|  |  |  |     signups_allowed: bool, | 
			
		
	
		
			
				
					|  |  |  |     invitations_allowed: bool, | 
			
		
	
		
			
				
					|  |  |  |     email_invitations: bool, | 
			
		
	
		
			
				
					|  |  |  |     server_admin_email: Option<String>, | 
			
		
	
		
			
				
					|  |  |  |     password_iterations: i32, | 
			
		
	
		
			
				
					|  |  |  |     show_password_hint: bool, | 
			
		
	
	
		
			
				
					|  |  | @ -322,7 +321,6 @@ impl Config { | 
			
		
	
		
			
				
					|  |  |  |             signups_allowed: get_env_or("SIGNUPS_ALLOWED", true), | 
			
		
	
		
			
				
					|  |  |  |             server_admin_email: get_env("SERVER_ADMIN_EMAIL"), | 
			
		
	
		
			
				
					|  |  |  |             invitations_allowed: get_env_or("INVITATIONS_ALLOWED", true), | 
			
		
	
		
			
				
					|  |  |  |             email_invitations: get_env_or("EMAIL_INVITATIONS", false), | 
			
		
	
		
			
				
					|  |  |  |             password_iterations: get_env_or("PASSWORD_ITERATIONS", 100_000), | 
			
		
	
		
			
				
					|  |  |  |             show_password_hint: get_env_or("SHOW_PASSWORD_HINT", true), | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 |