Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:Romulus21/portal into feature/Events

Browse Source
This commit is contained in:
Romulus21
2020-08-15 10:24:16 +02:00
parent 108dc4105b 08c93b569d
commit 0b9229d966
30 changed files with 573 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AuthUserController.php
View File

@@ -9,6 +9,6 @@ class AuthUserController extends Controller
{
public function show()
{
return New UserResource(auth()->user());
return new UserResource(auth()->user());
}
}

13
app/Http/Controllers/BookmarkController.php
View File

@@ -66,18 +66,19 @@ class BookmarkController extends Controller
$promise = $client->requestAsync('GET', $url);
$response = $promise->wait();
$page = $response->getBody()->getContents();
preg_match("/\<title\>(.*)\<\/title\>/i",$page,$title);
preg_match("/\<title\>(.*)\<\/title\>/i", $page, $title);
$metas['title'] = $title[1];
preg_match('/\<link rel="[icon|appel-touch](.*)\"\>/i',$page,$favicon);
if(isset($favicon[1])) {
preg_match('/href="(.*)/i',$favicon[1],$favicon);
preg_match('/\<link rel="[icon|appel-touch](.*)\"\>/i', $page, $favicon);
if (isset($favicon[1])) {
preg_match('/href="(.*)/i', $favicon[1], $favicon);
$metas['favicon'] = $favicon[1];
preg_match('/http/', $metas['favicon'], $matches);
if(empty($matches)) {
$metas['favicon'] = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).$metas['favicon'];
if (empty($matches)) {
$url = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST);
$metas['favicon'] = $url.$metas['favicon'];
}
//dd($metas['favicon'], $matches, !isset($matches[1]), empty($matches));
} else {

2
app/Http/Controllers/EventCategoryController.php
View File

@@ -75,7 +75,7 @@ class EventCategoryController extends Controller
*/
public function destroy(EventCategory $category)
{
if(auth()->user()->isAdmin()) {
if (auth()->user()->isAdmin()) {
$category->delete();
return response()->json([], 204);
} else {

4
app/Http/Controllers/ImageController.php
View File

@@ -14,7 +14,7 @@ class ImageController extends Controller
public function users(User $user)
{
foreach (auth()->user()->images as $image) {
if(File::exists(storage_path('app/public/'.$image->path))) {
if (File::exists(storage_path('app/public/'.$image->path))) {
File::delete(storage_path('app/public/'.$image->path));
auth()->user()->images()->where('id', $image->id)->delete();
}
@@ -39,7 +39,7 @@ class ImageController extends Controller
public function memos(Memo $memo)
{
foreach ($memo->images as $image) {
if(File::exists(storage_path('app/public/'.$image->path))) {
if (File::exists(storage_path('app/public/'.$image->path))) {
File::delete(storage_path('app/public/'.$image->path));
$memo->images()->where('id', $image->id)->delete();
}

1
app/Http/Controllers/MeteoController.php
View File

@@ -18,6 +18,5 @@ class MeteoController extends Controller
$response = $promise->wait();
return $response->getBody()->getContents();
}
}

2
app/Http/Controllers/ToDoController.php
View File

@@ -63,7 +63,7 @@ class ToDoController extends Controller
{
$this->authorize('update', $toDoList);
($toDo->checked_at) ? $toDo->checked_at = NULL : $toDo->checked_at = now();
($toDo->checked_at) ? $toDo->checked_at = null : $toDo->checked_at = now();
$toDo->save();
return (new ToDoResource($toDo))

8
app/Http/Controllers/UserController.php
View File

@@ -2,12 +2,10 @@
namespace App\Http\Controllers;
use App\Mail\newUserInvitation;
use App\Jobs\SendMailNewUserJob;
use App\User;
use App\Http\Resources\User as UserResource;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\Response;
@@ -27,7 +25,7 @@ class UserController extends Controller
request()['password'] = Hash::make(Str::random(30));
$user = User::create($this->validateData());
Mail::to($user->email)->send(new newUserInvitation($user));
SendMailNewUserJob::dispatch($user);
return (new UserResource($user))
->response()
@@ -36,7 +34,7 @@ class UserController extends Controller
public function show(User $user)
{
return New UserResource($user);
return new UserResource($user);
}
private function validateData()