| 
                                                        @@ -91,7 +91,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                             			}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    93
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    93
                                                                                                                                                                                                 | 
                                                             			// based on owner's userid, we create federateduser and a new circle  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    94
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			$this->output->writeln('+ New Team <info>' . $rowCG['display_name'] . '</info>, owner by <info>' . $ownerId . '</info>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    94
                                                                                                                                                                                                 | 
                                                            +			$this->output->writeln('+ New Team <info>'.$rowCG['display_name'].'</info>, owner by <info>'.$ownerId.'</info>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    95
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    95
                                                                                                                                                                                                 | 
                                                             			$owner = $this->cachedFed($ownerId);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    96
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    96
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    97
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    97
                                                                                                                                                                                                 | 
                                                             			$this->circlesManager->startSession($owner);  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -118,13 +118,13 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    118
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    118
                                                                                                                                                                                                 | 
                                                             						continue; // owner is already in the circles  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    119
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    119
                                                                                                                                                                                                 | 
                                                             					}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    120
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    120
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    121
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -					$this->output->writeln(' - new member <info>' . $userId .'</info>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    121
                                                                                                                                                                                                 | 
                                                            +					$this->output->writeln(' - new member <info>'.$userId.'</info>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    122
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    122
                                                                                                                                                                                                 | 
                                                             					$member = $this->circlesManager->addMember($circle->getSingleId(), $this->cachedFed($userId));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    123
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    123
                                                                                                                                                                                                 | 
                                                             					if ($rowM['role'] === '1') { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    124
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    124
                                                                                                                                                                                                 | 
                                                             						$this->circlesManager->levelMember($member->getId(), Member::LEVEL_ADMIN);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    125
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    125
                                                                                                                                                                                                 | 
                                                             					}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    126
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    126
                                                                                                                                                                                                 | 
                                                             				} catch (\Exception $e) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    127
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -					$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    127
                                                                                                                                                                                                 | 
                                                            +					$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error>'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    128
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    128
                                                                                                                                                                                                 | 
                                                             					$this->logger->log(2, 'error while migrating custom group member', ['exception' => $e]);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    129
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    129
                                                                                                                                                                                                 | 
                                                             				}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    130
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    130
                                                                                                                                                                                                 | 
                                                             			}  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -160,7 +160,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    160
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    160
                                                                                                                                                                                                 | 
                                                             			   ->where($update->expr()->in('id', $update->createNamedParameter($shareIds, IQueryBuilder::PARAM_INT_ARRAY))); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    161
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    161
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    162
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    162
                                                                                                                                                                                                 | 
                                                             		$count = $update->executeStatement();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    163
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$this->output->writeln('> ' . $count . ' shares updated'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    163
                                                                                                                                                                                                 | 
                                                            +		$this->output->writeln('> '.$count.' shares updated'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    164
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    164
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    165
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    165
                                                                                                                                                                                                 | 
                                                             		$this->fixShareChildren($shareIds, $memberIds);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    166
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    166
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -194,13 +194,13 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    194
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    194
                                                                                                                                                                                                 | 
                                                             			->andWhere($update->expr()->eq('share_with', $update->createParameter('old_recipient'))); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    195
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    195
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    196
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    196
                                                                                                                                                                                                 | 
                                                             		$count = 0;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    197
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		foreach($memberIds as $memberId) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    197
                                                                                                                                                                                                 | 
                                                            +		foreach ($memberIds as $memberId) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    198
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    198
                                                                                                                                                                                                 | 
                                                             			$update->setParameter('old_recipient', $memberId); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    199
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    199
                                                                                                                                                                                                 | 
                                                             			$update->setParameter('new_recipient', $this->cachedFed($memberId)->getSingleId()); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    200
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    200
                                                                                                                                                                                                 | 
                                                             			$count += $update->executeStatement();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    201
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    201
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    202
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    202
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    203
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$this->output->writeln('> ' . $count . ' children shares updated'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    203
                                                                                                                                                                                                 | 
                                                            +		$this->output->writeln('> '.$count.' children shares updated'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    204
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    204
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    205
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    205
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    206
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    206
                                                                                                                                                                                                 | 
                                                               |