File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -237,7 +237,7 @@ public function addUser(string $userid,
237237		$ isAdmin$ this groupManager ->isAdmin ($ usergetUID ());
238238		$ subAdminManager$ this groupManager ->getSubAdmin ();
239239
240- 		if (empty ($ userid$ this config ->getAppValue ('settings ' , 'newUser.generateUserID ' , '0 ' ) === '1 ' ) {
240+ 		if (empty ($ userid$ this config ->getAppValue ('core ' , 'newUser.generateUserID ' , 'no ' ) === 'yes ' ) {
241241			$ userid$ this createNewUserId ();
242242		}
243243
@@ -293,7 +293,7 @@ public function addUser(string $userid,
293293			$ generatePasswordResetTokentrue ;
294294		}
295295
296- 		if  ($ email''  && $ this config ->getAppValue ('settings ' , 'newUser.requireEmail ' , '0 ' ) === '1 ' ) {
296+ 		if  ($ email''  && $ this config ->getAppValue ('core ' , 'newUser.requireEmail ' , 'no ' ) === 'yes ' ) {
297297			throw  new  OCSException ('Required email address was not provided ' , 110 );
298298		}
299299
Original file line number Diff line number Diff line change @@ -428,7 +428,7 @@ public function testAddUserSuccessfulGenerateUserID() {
428428			->method ('getAppValue ' )
429429			->willReturnCallback (function ($ appid$ key$ default
430430				if ($ key'newUser.generateUserID ' ) {
431- 					return  true ;
431+ 					return  ' yes ' 
432432				}
433433				return  null ;
434434			});
@@ -483,7 +483,7 @@ public function testAddUserFailedToGenerateUserID() {
483483			->method ('getAppValue ' )
484484			->willReturnCallback (function ($ appid$ key$ default
485485				if ($ key'newUser.generateUserID ' ) {
486- 					return  '1 ' ;
486+ 					return  'yes ' ;
487487				}
488488				return  null ;
489489			});
@@ -526,7 +526,7 @@ public function testAddUserEmailRequired() {
526526			->method ('getAppValue ' )
527527			->willReturnCallback (function ($ appid$ key$ default
528528				if ($ key'newUser.requireEmail ' ) {
529- 					return  '1 ' ;
529+ 					return  'yes ' ;
530530				}
531531				return  null ;
532532			});
Original file line number Diff line number Diff line change @@ -246,8 +246,8 @@ public function usersList() {
246246		// Settings 
247247		$ serverData'defaultQuota ' ] = $ defaultQuota
248248		$ serverData'canChangePassword ' ] = $ canChangePassword
249- 		$ serverData'newUserGenerateUserID ' ] = $ this config ->getAppValue ('settings ' , 'newUser.generateUserID ' , '0 ' ) === '1 ' ;
250- 		$ serverData'newUserRequireEmail ' ] = $ this config ->getAppValue ('settings ' , 'newUser.requireEmail ' , '0 ' ) === '1 ' ;
249+ 		$ serverData'newUserGenerateUserID ' ] = $ this config ->getAppValue ('core ' , 'newUser.generateUserID ' , 'no ' ) === 'yes ' ;
250+ 		$ serverData'newUserRequireEmail ' ] = $ this config ->getAppValue ('core ' , 'newUser.requireEmail ' , 'no ' ) === 'yes ' ;
251251
252252		return  new  TemplateResponse ('settings ' , 'settings-vue ' , ['serverData '  => $ serverData
253253	}
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments