fgdfggffg

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(

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(

Templates/Pages/tune/uuid.html.twig

@@ -45,13 +45,6 @@
                 </div>
                 <div class="right">
 
-                    <div class="ThreeDContainer">
-                        <h2>{{ "Audio"|translate }}</h2>
-                        <pre id="MIDI--{{ TuneDetails.ID }}"></pre>
-                        <button onclick="MIDIjs.play('/API/V1/GetMIDIFile.php?tune-id={{ TuneDetails.ID }}');">{{ "Play"|translate }}</button>
-                        <button onclick="MIDIjs.stop();">{{ "Stop"|translate }}</button>
-                    </div>
-
                     <div class="ThreeDContainer">
                         <div class="DLContainer">
                             <h2>{{ "Tune Overview"|translate }}</h2>
@@ -64,6 +57,23 @@
                                 <dd>{{ TuneDetails.Parts|json_encode }}</dd>
                             </dl>
                         </div>
+                        <h2>{{ "Links"|translate }}</h2>
+                        <ul>
+                            {% if TuneDetails.Link_Musescore != null %}
+                            <li>
+                                <a href="{{ TuneDetails.Link_Musescore }}" target="_blank">
+                                    <img src="/Static/Assets/Images/Logos/Musescore.png">
+                                </a>
+                            </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+
+                    <div class="ThreeDContainer">
+                        <h2>{{ "Audio"|translate }}</h2>
+                        <pre id="MIDI--{{ TuneDetails.ID }}"></pre>
+                        <button onclick="MIDIjs.play('/API/V1/GetMIDIFile.php?tune-id={{ TuneDetails.ID }}');">{{ "Play"|translate }}</button>
+                        <button onclick="MIDIjs.stop();">{{ "Stop"|translate }}</button>
                     </div>
 
                     <div id="RatingContainer" class="ThreeDContainer" >