@@ -65,10 +65,11 @@ |
||
| 65 | 65 | $user->slug = str_slug($userData->name); |
| 66 | 66 | $user->email = $userData->email; |
| 67 | 67 | $user->firstname = $userData->name; |
| 68 | - if (strlen($userData->nickname) != 0) |
|
| 69 | - $user->name = $userData->nickname; |
|
| 70 | - else |
|
| 71 | - $user->name = $userData->email; |
|
| 68 | + if (strlen($userData->nickname) != 0) { |
|
| 69 | + $user->name = $userData->nickname; |
|
| 70 | + } else { |
|
| 71 | + $user->name = $userData->email; |
|
| 72 | + } |
|
| 72 | 73 | $user->save(); |
| 73 | 74 | } |
| 74 | 75 | } |
@@ -82,10 +82,12 @@ |
||
| 82 | 82 | */ |
| 83 | 83 | public function federation() |
| 84 | 84 | { |
| 85 | - if ($this->association != null) |
|
| 86 | - return $this->association->federation(); |
|
| 87 | - else |
|
| 88 | - return $this->association(); //TODO THIS IS BAD :( |
|
| 85 | + if ($this->association != null) { |
|
| 86 | + return $this->association->federation(); |
|
| 87 | + } else { |
|
| 88 | + return $this->association(); |
|
| 89 | + } |
|
| 90 | + //TODO THIS IS BAD :( |
|
| 89 | 91 | } |
| 90 | 92 | |
| 91 | 93 | /** |
@@ -86,9 +86,14 @@ |
||
| 86 | 86 | private function rmdir_recursive($dir) |
| 87 | 87 | { |
| 88 | 88 | foreach (scandir($dir) as $file) { |
| 89 | - if ('.' === $file || '..' === $file) continue; |
|
| 90 | - if (is_dir("$dir/$file")) $this->rmdir_recursive("$dir/$file"); |
|
| 91 | - else unlink("$dir/$file"); |
|
| 89 | + if ('.' === $file || '..' === $file) { |
|
| 90 | + continue; |
|
| 91 | + } |
|
| 92 | + if (is_dir("$dir/$file")) { |
|
| 93 | + $this->rmdir_recursive("$dir/$file"); |
|
| 94 | + } else { |
|
| 95 | + unlink("$dir/$file"); |
|
| 96 | + } |
|
| 92 | 97 | } |
| 93 | 98 | rmdir($dir); |
| 94 | 99 | } |
@@ -46,16 +46,18 @@ |
||
| 46 | 46 | |
| 47 | 47 | public function edit(User $user, Federation $federation) |
| 48 | 48 | { |
| 49 | - if ($user->federationOwned == null) |
|
| 50 | - return false; |
|
| 49 | + if ($user->federationOwned == null) { |
|
| 50 | + return false; |
|
| 51 | + } |
|
| 51 | 52 | |
| 52 | 53 | return $user->federationOwned->id == $federation->id; |
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | public function update(User $user, Federation $federation) |
| 56 | 57 | { |
| 57 | - if ($user->federationOwned == null) |
|
| 58 | - return false; |
|
| 58 | + if ($user->federationOwned == null) { |
|
| 59 | + return false; |
|
| 60 | + } |
|
| 59 | 61 | |
| 60 | 62 | return $user->federationOwned->id == $federation->id; |
| 61 | 63 | } |