From 2bb9344a0080078e6fbcaf471b15728b2ed84444 Mon Sep 17 00:00:00 2001 From: Cerys Date: Wed, 24 Sep 2025 17:27:17 +0100 Subject: [PATCH] fgdfggffg --- Pages/profile.php | 19 +++++++++++--- Pages/tune-set/uuid.php | 2 ++ .../Static/Assets/Images/Logos/Musescore.png | Bin 0 -> 6118 bytes Templates/Pages/tune/uuid.html.twig | 24 +++++++++++++----- 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 Public/Static/Assets/Images/Logos/Musescore.png diff --git a/Pages/profile.php b/Pages/profile.php index f7aac43..c531d27 100644 --- a/Pages/profile.php +++ b/Pages/profile.php @@ -8,6 +8,11 @@ use App\Wrappers\TwigWrapper; require_once __DIR__ . "/../vendor/autoload.php"; +if(!$_SESSION[SessionElement::IS_LOGGED_IN->value]) +{ + header("Location: /login"); + die(); +} $db = new DatabaseInteractions(); @@ -40,24 +45,30 @@ $yourTuneSets = $db->RunSelect( ) AS TunesInSet" ]) ->join( - join: 'LEFT', + join: 'INNER', spec: 'TuneSetTunes AS T_TST', cond: 'T.ID=T_TST.TuneSetID' ) ->join( - join: 'LEFT', + join: 'INNER', spec: 'Tunes AS T_T', cond: 'T_TST.TuneID=T_T.ID' ) ->where(cond: 'T.CreatedBy LIKE :__user_id__') + ->groupBy(spec: [ + 'T.ID', + ]) ->orderBy(spec: [ 'T_TST.Order ASC', ]) ->bindValue(name: '__user_id__', value: SessionWrapper::Get(target: SessionElement::USER_ID)) ); -for($i = 0; $i < sizeof($yourTuneSets); $i++) - $yourTuneSets[$i]["TunesInSet"] = json_decode($yourTuneSets[$i]["TunesInSet"], true); +for($i = 0, $iMax = count($yourTuneSets); $i < $iMax; $i++) +{ + $yourTuneSets[$i]["TunesInSet"] = json_decode($yourTuneSets[$i]["TunesInSet"], true, 512, JSON_THROW_ON_ERROR); +} + $yourLikedTunes = $db->RunSelect( queryBuilder: SQLQueryBuilderWrapper::SELECT( diff --git a/Pages/tune-set/uuid.php b/Pages/tune-set/uuid.php index 1787c76..c2f670a 100644 --- a/Pages/tune-set/uuid.php +++ b/Pages/tune-set/uuid.php @@ -34,9 +34,11 @@ $tunesInSet = $db->RunSelect( spec: 'Tunes AS T_T', cond: 'T.TuneID=T_T.ID', ) + ->where(cond: 'T.TuneSetID LIKE :__tune_set_id__') ->orderBy(spec: [ 'T.Order ASC', ]) + ->bindValue(name: '__tune_set_id__', value: $_GET["tune-set-id"]) ); TwigWrapper::RenderTwig( diff --git a/Public/Static/Assets/Images/Logos/Musescore.png b/Public/Static/Assets/Images/Logos/Musescore.png new file mode 100644 index 0000000000000000000000000000000000000000..6ce5d573e9d80b1290a5d7864834377959b529a6 GIT binary patch literal 6118 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 literal 0 HcmV?d00001 diff --git a/Templates/Pages/tune/uuid.html.twig b/Templates/Pages/tune/uuid.html.twig index c865e14..da1c430 100644 --- a/Templates/Pages/tune/uuid.html.twig +++ b/Templates/Pages/tune/uuid.html.twig @@ -45,13 +45,6 @@
-
-

{{ "Audio"|translate }}

- 

-                        
-                        
-                    

-
                     

                         

                             
{{ "Tune Overview"|translate }}

@@ -64,6 +57,23 @@
                                 
{{ TuneDetails.Parts|json_encode }}

                             
                         

+                        
{{ "Links"|translate }}

+                        
    
+                            {% if TuneDetails.Link_Musescore != null %}
+                            
  • 
+                                
+                                    
+                                
+                            
    • 
+                            {% endif %}
+                        

+                    

+
+                    

+                        
{{ "Audio"|translate }}

+                        

+                        
+