Fixed changes in merged pull request

1279d47

@MagicLike

Author: JulianPrieber

littlelink/icons/mastodon.svg

@@ -296,29 +296,23 @@ function getUrlSatusCodesb($urlsb, $timeoutsb = 3)
 					@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 @@ function copyText(text) {
 @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 @@ function URL_event_exists(string $urlsb): bool
 }
 </script>
 			@endif
+<?php } catch (Exception $e){} ?>
 @endif
       <! –– #### end event detection #### ––>
               @yield('content')

resources/views/layouts/sidebar.blade.php

@@ -95,7 +95,11 @@ function themeAsset($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
 

resources/views/littlelink.blade.php

@@ -105,7 +105,7 @@
 
     // 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.