From 314701dfafaaccf0b6a4b55bb7f2c405e35d4456 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 10 Nov 2022 13:46:10 +0100
Subject: [PATCH] Fixed changes in merged pull request

https://github.com/JulianPrieber/littlelink-custom/commit/1279d478e282c3af33f16e1b5d930b52661d3a1a

@MagicLike
---
 littlelink/icons/mastodon.svg             |  6 +--
 resources/views/layouts/sidebar.blade.php | 47 ++++++++---------------
 resources/views/littlelink.blade.php      |  7 +++-
 storage/templates/advanced-config.php     |  2 +-
 4 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/littlelink/icons/mastodon.svg b/littlelink/icons/mastodon.svg
index 9d8ff0e..45a6a7c 100644
--- a/littlelink/icons/mastodon.svg
+++ b/littlelink/icons/mastodon.svg
@@ -1,4 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path d="M22.53 14.35c-.32 1.66-2.9 3.48-5.85 3.84-1.54.18-3.06.35-4.68.28-2.65-.12-4.73-.63-4.73-.63 0 .26.02.5.05.73.34 2.61 2.59 2.77 4.72 2.84 2.15.07 4.06-.53 4.06-.53l.09 1.94s-1.5.81-4.18.95c-1.47.08-3.31-.04-5.44-.6-4.63-1.22-5.42-6.16-5.54-11.16-.04-1.49-.01-2.89-.01-4.06 0-5.12 3.35-6.62 3.35-6.62C6.06.55 8.96.23 11.98.2h.07c3.02.02 5.92.35 7.61 1.13 0 0 3.35 1.5 3.35 6.62-.01 0 .03 3.78-.48 6.4" fill="#3088d4"/>
-  <path d="M19.05 8.35v6.2H16.6V8.53c0-1.27-.53-1.91-1.6-1.91-1.18 0-1.77.76-1.77 2.27v3.29h-2.44V8.89c0-1.51-.59-2.27-1.77-2.27-1.07 0-1.6.64-1.6 1.91v6.01H4.95v-6.2c0-1.27.32-2.27.97-3.02.67-.74 1.54-1.13 2.63-1.13 1.26 0 2.21.48 2.84 1.45L12 6.68l.61-1.02c.63-.97 1.58-1.45 2.84-1.45 1.09 0 1.96.38 2.63 1.13.64.74.97 1.74.97 3.01" fill="#fff"/>
-</svg>
+<svg width="74" height="79" viewBox="0 0 74 79" fill="white" xmlns="http://www.w3.org/2000/svg">
+<path d="M73.7014 17.9592C72.5616 9.62034 65.1774 3.04876 56.424 1.77536C54.9472 1.56019 49.3517 0.7771 36.3901 0.7771H36.2933C23.3281 0.7771 20.5465 1.56019 19.0697 1.77536C10.56 3.01348 2.78877 8.91838 0.903306 17.356C-0.00357857 21.5113 -0.100361 26.1181 0.068112 30.3439C0.308275 36.404 0.354874 42.4535 0.91406 48.489C1.30064 52.498 1.97502 56.4751 2.93215 60.3905C4.72441 67.6217 11.9795 73.6395 19.0876 76.0945C26.6979 78.6548 34.8821 79.0799 42.724 77.3221C43.5866 77.1245 44.4398 76.8953 45.2833 76.6342C47.1867 76.0381 49.4199 75.3714 51.0616 74.2003C51.0841 74.1839 51.1026 74.1627 51.1156 74.1382C51.1286 74.1138 51.1359 74.0868 51.1368 74.0592V68.2108C51.1364 68.185 51.1302 68.1596 51.1185 68.1365C51.1069 68.1134 51.0902 68.0932 51.0695 68.0773C51.0489 68.0614 51.0249 68.0503 50.9994 68.0447C50.9738 68.0391 50.9473 68.0392 50.9218 68.045C45.8976 69.226 40.7491 69.818 35.5836 69.8087C26.694 69.8087 24.3031 65.6569 23.6184 63.9285C23.0681 62.4347 22.7186 60.8764 22.5789 59.2934C22.5775 59.2669 22.5825 59.2403 22.5934 59.216C22.6043 59.1916 22.621 59.1702 22.6419 59.1533C22.6629 59.1365 22.6876 59.1248 22.714 59.1191C22.7404 59.1134 22.7678 59.1139 22.794 59.1206C27.7345 60.2936 32.799 60.8856 37.8813 60.8843C39.1036 60.8843 40.3223 60.8843 41.5447 60.8526C46.6562 60.7115 52.0437 60.454 57.0728 59.4874C57.1983 59.4628 57.3237 59.4416 57.4313 59.4098C65.3638 57.9107 72.9128 53.2051 73.6799 41.2895C73.7086 40.8204 73.7803 36.3758 73.7803 35.889C73.7839 34.2347 74.3216 24.1533 73.7014 17.9592ZM61.4925 47.6918H53.1514V27.5855C53.1514 23.3526 51.3591 21.1938 47.7136 21.1938C43.7061 21.1938 41.6988 23.7476 41.6988 28.7919V39.7974H33.4078V28.7919C33.4078 23.7476 31.3969 21.1938 27.3894 21.1938C23.7654 21.1938 21.9552 23.3526 21.9516 27.5855V47.6918H13.6176V26.9752C13.6176 22.7423 14.7157 19.3795 16.9118 16.8868C19.1772 14.4 22.1488 13.1231 25.8373 13.1231C30.1064 13.1231 33.3325 14.7386 35.4832 17.9662L37.5587 21.3949L39.6377 17.9662C41.7884 14.7386 45.0145 13.1231 49.2765 13.1231C52.9614 13.1231 55.9329 14.4 58.2055 16.8868C60.4017 19.3772 61.4997 22.74 61.4997 26.9752L61.4925 47.6918Z" fill="inherit"/>
\ No newline at end of file
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 6e84674..1feae60 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -296,29 +296,23 @@ if($url1sb == '200'  or $url2sb == '200') {
 					@endif
 				@endif
 	@elseif(env('NOTIFY_UPDATES') == 'true' or env('NOTIFY_UPDATES') === 'major' or env('NOTIFY_UPDATES') === 'all')
-	<?php // Checks if URL exists
-					try {
-					function URL_exists(string $urlsb): bool
-					{
-						return str_contains(get_headers($urlsb)[0], "200 OK");
-					}
-					         // Sets $ServerExists to true if URL exists
-						if (URL_exists("https://julianprieber.github.io/littlelink-custom/version.json")){
-							$ServerExists = "true";
-						}
-						} catch (exception $e) {
-							$ServerExists = "false";
-						}
-						?>
 
                 <! –– Checks if file version.json exists AND if version.json exists on server to continue (without this PHP will throw ErrorException ) ––>
-                @if(file_exists(base_path("version.json")) and $ServerExists == 'true')
+                @if(file_exists(base_path("version.json")))
 
                   <?php // Requests newest version from server and sets it as variable
-                  $Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json"); 
+
+                  try{
+                  $Vgit = file_get_contents("https://version.littlelink-custom.com/"); 
 
 				       // Requests current version from the local version file and sets it as variable
-                  $Vlocal = file_get_contents(base_path("version.json")); 
+                  $Vlocal = file_get_contents(base_path("version.json"));
+                  }
+
+                  catch (Exception $e){
+                  $Vgit = "0"; 
+                  $Vlocal = "0"; 
+				  }
 					?>
 
 					<! –– If user has role admin AND newest GitHub release version is higher than the local one an update notice will be displayed ––>
@@ -454,22 +448,10 @@ $userdbs = DB::table('users')->where('id', $littlelink_current)->get();
 @endif
 
       <! –– #### begin event detection #### ––>
-		<?php
-			try {
-				function URL_event_exists(string $urlsb): bool
-				{
-				return str_contains(get_headers($urlsb)[0], "200 OK");
-					}
-						if (URL_event_exists("https://julianprieber.github.io/littlelink-custom-events/event.json")){
-							$EventServerExists = "true";
-						}
-							} catch (exception $e) {
-								$EventServerExists = "false";
-							}
-						?>
-	@if(env('NOTIFY_EVENTS') === true and $EventServerExists == 'true')
+	@if(env('NOTIFY_EVENTS') === true)
         <?php
-        $GetEventJson = file_get_contents("https://julianprieber.github.io/littlelink-custom-events/event.json");
+        try{
+        $GetEventJson = file_get_contents("https://event.littlelink-custom.com/");
 		$EventJson = json_decode($GetEventJson, true);
 		if(isset($_COOKIE['HideEvent']) == NULL) {
 			setcookie("HideEvent",$_COOKIE['ID'] = "0", time()+60*60*24*5, "/");
@@ -504,6 +486,7 @@ if(localStorage.getItem("firstTime")==null){
 }
 </script>
 			@endif
+<?php } catch (Exception $e){} ?>
 @endif
       <! –– #### end event detection #### ––>
               @yield('content')
diff --git a/resources/views/littlelink.blade.php b/resources/views/littlelink.blade.php
index e8cc8e4..5fd1ff9 100644
--- a/resources/views/littlelink.blade.php
+++ b/resources/views/littlelink.blade.php
@@ -95,7 +95,11 @@ return $path;}
   <meta name="designer" href="{{ url('') . "/theme/@" . $littlelink_name}}" content="{{ url('') . "/theme/@" . $littlelink_name}}">
 
   <link rel="stylesheet" href="themes/{{$info->theme}}/share.button.css">
+  @if(theme('use_default_buttons') == "true")
+  <link rel="stylesheet" href="{{ asset('littlelink/css/brands.css') }}">
+  @else
   <link rel="stylesheet" href="themes/{{$info->theme}}/brands.css">
+  @endif
   <link rel="stylesheet" href="themes/{{$info->theme}}/skeleton-auto.css">
 @if(file_exists(base_path('themes/' . $info->theme . '/animations.css')))
   <link rel="stylesheet" href="<?php echo asset('themes/' . $info->theme . '/animations.css') ?>">
@@ -286,7 +290,8 @@ function get_operating_system() {
          @elseif($link->name === "heading")
          <h2>{{ $link->title }}</h2>
          @else
-         <div style="--delay: {{ $initial++ }}s" class="button-entrance"><a class="button button-{{ $link->name }} button button-hover icon-hover" rel="noopener noreferrer nofollow" href="{{ route('clickNumber') . '/' . $link->id . '/' . $link->link}}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif ><img alt="button-icon" class="icon hvr-icon" src="@if(theme('use_custom_icons') == "true"){{ url('themes/' . $GLOBALS['themeName'] . '/extra/custom-icons')}}/{{$linkName}}{{theme('custom_icon_extension')}} @else{{ asset('\/littlelink/icons\/') . $linkName }}.svg @endif">{{ $link->title }}</a></div>
+         <?php include base_path('config/button-names.php'); $newLinkName = $linkName; $isNewName = "false"; foreach($buttonNames as $key => $value) { if($newLinkName == $key) { $newLinkName = $value; $isNewName = "true"; } } ?>
+         <div style="--delay: {{ $initial++ }}s" class="button-entrance"><a class="button button-{{ $link->name }} button button-hover icon-hover" rel="noopener noreferrer nofollow" href="{{ route('clickNumber') . '/' . $link->id . '/' . $link->link}}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif ><img alt="button-icon" class="icon hvr-icon" src="@if(theme('use_custom_icons') == "true"){{ url('themes/' . $GLOBALS['themeName'] . '/extra/custom-icons')}}/{{$linkName}}{{theme('custom_icon_extension')}} @else{{ asset('\/littlelink/icons\/') . $linkName }}.svg @endif">@if($isNewName == "true"){{ $newLinkName }}@else{{ ucfirst($newLinkName) }}@endif</a></div>
          @endif
         @endforeach
 
diff --git a/storage/templates/advanced-config.php b/storage/templates/advanced-config.php
index 7b49c5d..a107e82 100644
--- a/storage/templates/advanced-config.php
+++ b/storage/templates/advanced-config.php
@@ -105,7 +105,7 @@ return [
 
     // The URL prefix is the symbol that comes before a LittleLink URL.
     // For example the '@' in 'example.com/@admin'.
-    // If empty no prefix is required. Use with caution.
+    // If empty no prefix is required.
     'custom_url_prefix' => '+', // The '@' prefix will always work regardless of this setting.