Skip to content

Commit 37fd33a

Browse files
committed
Unique Image String Attached to Uploaded Images
The system now assigns a unique string to uploaded images, ensuring renewed cached images when new ones are uploaded. #480
1 parent 7901330 commit 37fd33a

File tree

2 files changed

+8
-35
lines changed

2 files changed

+8
-35
lines changed

app/Http/Controllers/AdminController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public function editUser(request $request)
274274
User::where('id', $id)->update(['name' => $name, 'email' => $email, 'password' => $password, 'littlelink_name' => $littlelink_name, 'littlelink_description' => $littlelink_description, 'role' => $role]);
275275
}
276276
if (!empty($profilePhoto)) {
277-
$profilePhoto->move(base_path('assets/img'), $id . ".png");
277+
$profilePhoto->move(base_path('assets/img'), $id . '_' . time() . ".png");
278278
}
279279
if (!empty($customBackground)) {
280280
$directory = base_path('assets/img/background-img/');
@@ -286,7 +286,7 @@ public function editUser(request $request)
286286
}}
287287
if(file_exists(base_path('assets/img/background-img/').$pathinfo)){File::delete(base_path('assets/img/background-img/').$pathinfo);}
288288

289-
$customBackground->move(base_path('assets/img/background-img/'), $id.".".$request->file('background')->extension());
289+
$customBackground->move(base_path('assets/img/background-img/'), $id . '_' . time() . "." . $request->file('background')->extension());
290290
}
291291

292292
return redirect('admin/users/all');
@@ -339,7 +339,7 @@ public function editSite(request $request)
339339
}}
340340
if(file_exists(base_path('/assets/linkstack/images/').$pathinfo)){File::delete(base_path('/assets/linkstack/images/').$pathinfo);}
341341

342-
$logo->move(base_path('/assets/linkstack/images/'), "avatar.".$request->file('image')->extension());
342+
$logo->move(base_path('/assets/linkstack/images/'), "avatar" . '_' . time() . "." .$request->file('image')->extension());
343343
}
344344

345345
if (!empty($icon)) {
@@ -353,7 +353,7 @@ public function editSite(request $request)
353353
}}
354354
if(file_exists(base_path('/assets/linkstack/images/').$pathinfo)){File::delete(base_path('/assets/linkstack/images/').$pathinfo);}
355355

356-
$icon->move(base_path('/assets/linkstack/images/'), "favicon.".$request->file('icon')->extension());
356+
$icon->move(base_path('/assets/linkstack/images/'), "favicon" . '_' . time() . "." . $request->file('icon')->extension());
357357
}
358358
return back();
359359
}

app/Http/Controllers/UserController.php

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use DB;
1515
use ZipArchive;
1616
use File;
17-
use DOMDocument;
1817

1918
use App\Models\User;
2019
use App\Models\Button;
@@ -721,42 +720,16 @@ public function editPage(request $request)
721720

722721
$profilePhoto = $request->file('image');
723722
$pageName = $request->littlelink_name;
724-
$pageDescription = $request->pageDescription;
725-
726-
// Strip HTML tags except for allowed tags
727-
$pageDescription = strip_tags($pageDescription, '<a><p><strong><i><ul><ol><li><blockquote><h2><h3><h4>');
728-
729-
// Sanitize attributes and remove JavaScript code
730-
if (!empty($pageDescription)) {
731-
$document = new DOMDocument();
732-
$document->loadHTML($pageDescription, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
733-
734-
// Find all elements that have attributes
735-
$elements = $document->getElementsByTagName('*');
736-
foreach ($elements as $element) {
737-
// Check each attribute of the element
738-
foreach ($element->attributes as $attribute) {
739-
$attributeName = $attribute->nodeName;
740-
741-
// Remove attributes that contain "on" followed by an event name
742-
if (strpos($attributeName, 'on') === 0) {
743-
$element->removeAttribute($attributeName);
744-
}
745-
}
746-
}
747-
748-
// Get the sanitized HTML back
749-
$pageDescription = $document->saveHTML();
750-
}
751-
723+
$pageDescription = strip_tags($request->pageDescription,'<a><p><strong><i><ul><ol><li><blockquote><h2><h3><h4>');
724+
$pageDescription = preg_replace("/<a([^>]*)>/i", "<a $1 rel=\"noopener noreferrer nofollow\">", $pageDescription);
752725
$name = $request->name;
753726
$checkmark = $request->checkmark;
754727
$sharebtn = $request->sharebtn;
755728

756729
User::where('id', $userId)->update(['littlelink_name' => $pageName, 'littlelink_description' => $pageDescription, 'name' => $name]);
757730

758731
if ($request->hasFile('image')) {
759-
$profilePhoto->move(base_path('assets/img'), $userId . ".png");
732+
$profilePhoto->move(base_path('assets/img'), $userId . '_' . time() . ".png");
760733
}
761734

762735
if($checkmark == "on"){
@@ -793,7 +766,7 @@ public function themeBackground(request $request)
793766
}}
794767
if(file_exists(base_path('assets/img/background-img/').$pathinfo)){File::delete(base_path('assets/img/background-img/').$pathinfo);}
795768

796-
$customBackground->move(base_path('assets/img/background-img/'), $userId.".".$request->file('image')->extension());
769+
$customBackground->move(base_path('assets/img/background-img/'), $userId . '_' . time() . "." . $request->file('image')->extension());
797770
}
798771

799772
return Redirect('/studio/theme');

0 commit comments

Comments
 (0)