Browse Source
			
			
			check disable_activity.email_address_changed_by_admin when email is changed by admin via the OCS API
			
				Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
			
			
				pull/34135/head
			
			
		 
		
			
				
					
						 Julien Veyssier
					
					3 years ago
						Julien Veyssier
					
					3 years ago
					
						
							committed by
							
								 Julien Veyssier
								Julien Veyssier
							
						 
					
				 
				
			 
		 
		
			
				
				  
				  No known key found for this signature in database
				  
				  	
						GPG Key ID: 4141FEE162030638
				  	
				  
				
			
		
		
		
	
		
			
				 1 changed files with 
5 additions and 
0 deletions
			 
			
		 
		
			
				- 
					
					
					 
					apps/settings/lib/Hooks.php
				
					
					
						
							
								
									
										
											
	
		
			
				
					|  |  | @ -178,12 +178,17 @@ class Hooks { | 
			
		
	
		
			
				
					|  |  |  | 		if ($actor instanceof IUser) { | 
			
		
	
		
			
				
					|  |  |  | 			$subject = Provider::EMAIL_CHANGED_SELF; | 
			
		
	
		
			
				
					|  |  |  | 			if ($actor->getUID() !== $user->getUID()) { | 
			
		
	
		
			
				
					|  |  |  | 				// set via the OCS API
 | 
			
		
	
		
			
				
					|  |  |  | 				if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') { | 
			
		
	
		
			
				
					|  |  |  | 					return; | 
			
		
	
		
			
				
					|  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  | 				$subject = Provider::EMAIL_CHANGED; | 
			
		
	
		
			
				
					|  |  |  | 			} | 
			
		
	
		
			
				
					|  |  |  | 			$text = $l->t('Your email address on %s was changed.', [$instanceUrl]); | 
			
		
	
		
			
				
					|  |  |  | 			$event->setAuthor($actor->getUID()) | 
			
		
	
		
			
				
					|  |  |  | 				->setSubject($subject); | 
			
		
	
		
			
				
					|  |  |  | 		} else { | 
			
		
	
		
			
				
					|  |  |  | 			// set with occ
 | 
			
		
	
		
			
				
					|  |  |  | 			if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') { | 
			
		
	
		
			
				
					|  |  |  | 				return; | 
			
		
	
		
			
				
					|  |  |  | 			} | 
			
		
	
	
		
			
				
					|  |  | 
 |