| 
                                                        @@ -447,7 +447,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    447
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    447
                                                                                                                                                                                                 | 
                                                             			$l10n = \OCP\Server::get(IFactory::class)->get('circles'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    448
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    448
                                                                                                                                                                                                 | 
                                                             			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    449
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    449
                                                                                                                                                                                                 | 
                                                             		} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    450
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    450
                                                                                                                                                                                                 | 
                                                            +			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    451
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    451
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    452
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    452
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    453
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    453
                                                                                                                                                                                                 | 
                                                             		$share->setSharedWithDisplayName($display);  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -533,20 +533,20 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    533
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    533
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    534
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    534
                                                                                                                                                                                                 | 
                                                             	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    535
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    535
                                                                                                                                                                                                 | 
                                                             		$shareTime = new DateTime();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    536
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    537
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    538
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$this->setId($this->get($prefix . 'id', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    539
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setShareType($this->getInt($prefix . 'share_type', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    540
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setPermissions($this->getInt($prefix . 'permissions', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    541
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setItemType($this->get($prefix . 'item_type', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    542
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setItemSource($this->getInt($prefix . 'item_source', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    543
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setItemTarget($this->get($prefix . 'item_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    544
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setFileSource($this->getInt($prefix . 'file_source', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    545
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setFileTarget($this->get($prefix . 'file_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    546
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setSharedWith($this->get($prefix . 'share_with', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    547
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setSharedBy($this->get($prefix . 'uid_initiator', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    548
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setShareOwner($this->get($prefix . 'uid_owner', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    549
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setToken($this->get($prefix . 'token', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    536
                                                                                                                                                                                                 | 
                                                            +		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    537
                                                                                                                                                                                                 | 
                                                            +  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    538
                                                                                                                                                                                                 | 
                                                            +		$this->setId($this->get($prefix.'id', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    539
                                                                                                                                                                                                 | 
                                                            +			 ->setShareType($this->getInt($prefix.'share_type', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    540
                                                                                                                                                                                                 | 
                                                            +			 ->setPermissions($this->getInt($prefix.'permissions', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    541
                                                                                                                                                                                                 | 
                                                            +			 ->setItemType($this->get($prefix.'item_type', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    542
                                                                                                                                                                                                 | 
                                                            +			 ->setItemSource($this->getInt($prefix.'item_source', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    543
                                                                                                                                                                                                 | 
                                                            +			 ->setItemTarget($this->get($prefix.'item_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    544
                                                                                                                                                                                                 | 
                                                            +			 ->setFileSource($this->getInt($prefix.'file_source', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    545
                                                                                                                                                                                                 | 
                                                            +			 ->setFileTarget($this->get($prefix.'file_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    546
                                                                                                                                                                                                 | 
                                                            +			 ->setSharedWith($this->get($prefix.'share_with', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    547
                                                                                                                                                                                                 | 
                                                            +			 ->setSharedBy($this->get($prefix.'uid_initiator', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    548
                                                                                                                                                                                                 | 
                                                            +			 ->setShareOwner($this->get($prefix.'uid_owner', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    549
                                                                                                                                                                                                 | 
                                                            +			 ->setToken($this->get($prefix.'token', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    550
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    550
                                                                                                                                                                                                 | 
                                                             			 ->setShareTime($shareTime);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    551
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    551
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    552
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    552
                                                                                                                                                                                                 | 
                                                             		$this->importAttributesFromDatabase($this->get('attributes', $data)); | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -557,9 +557,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    557
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    557
                                                                                                                                                                                                 | 
                                                             		//			$share->setPassword($this->get('password', $data, '')); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    558
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    558
                                                                                                                                                                                                 | 
                                                             		//		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    559
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    559
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    560
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$this->setChildId($this->getInt($prefix . 'child_id', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    561
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    562
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			 ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    560
                                                                                                                                                                                                 | 
                                                            +		$this->setChildId($this->getInt($prefix.'child_id', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    561
                                                                                                                                                                                                 | 
                                                            +			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    562
                                                                                                                                                                                                 | 
                                                            +			 ->setChildPermissions($this->getInt($prefix.'child_permissions', $data))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    563
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    563
                                                                                                                                                                                                 | 
                                                             			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    564
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    564
                                                                                                                                                                                                 | 
                                                             			 ->setStatus(Ishare::STATUS_ACCEPTED);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    565
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    565
                                                                                                                                                                                                 | 
                                                               |