Move sidebar to element

elements/sidebar.php

@@ -1,12 +1,10 @@
 <?php
-  echo "<div class=\"sidebar\">";
 
-  $image = $document->find(".bio-pic a")->attr("href");
-  $description = $document->find("#bio-text")->text();
-  $links = $document->find("#band-links li a");
+function echo_sidebar ($image, $text, $links = null) {
+  echo "<div class=\"sidebar\">";
 
   if (isset($image)) echo "<img src=\"" . convert_link($image) . "\">";
-  if (!empty($description)) echo "<p>" . nl2br(trim(preg_replace("/\.\.\...more\s*\n\s*$/", "", $description))) . "</p>";
+  if (!empty($text)) echo "<p>" . nl2br(trim(preg_replace("/\.\.\...more\s*\n\s*$/", "", $text))) . "</p>";
 
   if ($links->length) echo "<p>";
   foreach ($links as $index => $link) {
@@ -16,4 +14,6 @@
   if ($links->length) echo "</p>";
 
   echo "</div>";
+};
+
 ?>

pages/album.php

@@ -7,6 +7,7 @@
 ?>
 
 <?php include "../elements/header.php" ?>
+<?php include "../elements/sidebar.php" ?>
 <?php include "../utilities/link.php" ?>
 
 <?php
@@ -17,15 +18,10 @@
 
   echo "<div class=\"subpage\">";
 
-  echo "<div class=\"sidebar\">";
-
   $image = $document->find("#tralbumArt a")->attr("href");
-  $description = $document->find(".tralbum-about")->text();
-
-  if (isset($image)) echo "<img src=\"" . convert_link($image) . "\">";
-  if (!empty($description)) echo "<p>" . nl2br($description) . "</p>";
+  $text = $document->find(".tralbum-about")->text();
 
-  echo "</div>";
+  echo_sidebar($image, $text);
 
   echo "<div class=\"tracks\">";
 
@@ -47,7 +43,11 @@
 
   echo "</div>";
 
-  include "../elements/sidebar.php";
+  $image = $document->find(".bio-pic a")->attr("href");
+  $text = $document->find("#bio-text")->text();
+  $links = $document->find("#band-links li a");
+
+  echo_sidebar($image, $text, $links);
 
   echo "</div>";
 ?>

pages/artist.php

@@ -8,6 +8,7 @@
 
 <?php include "../elements/header.php" ?>
 <?php include "../elements/item.php" ?>
+<?php include "../elements/sidebar.php" ?>
 <?php include "../utilities/link.php" ?>
 
 <?php
@@ -41,7 +42,11 @@
 
   echo "</div>";
 
-  include "../elements/sidebar.php";
+  $image = $document->find(".bio-pic a")->attr("href");
+  $description = $document->find("#bio-text")->text();
+  $links = $document->find("#band-links li a");
+
+  echo_sidebar($image, $description, $links);
 
   echo "</div>";
 ?>