Use full url for document and packet viewing

Author: carlbennett

templates/Document/View.phtml

@@ -12,12 +12,16 @@ $description = Common::stripUpTo(trim(filter_var(
   ($object ? $object->getContent(true) : "The requested document does not exist or could not be found."),
   FILTER_SANITIZE_STRING
 )), "\n", 300);
-$this->opengraph->attach(new Pair("url", "/document/" . urlencode($object_id)));
 $this->opengraph->attach(new Pair("type", "article"));
 
 $url = Common::relativeUrlToAbsolute("/document/" . urlencode($object_id));
-if ($object)
+if ($object) {
   $url .= "/" . Common::sanitizeForUrl($object->getTitle(), true);
+  $this->opengraph->attach(new Pair("url", "/document/" . urlencode($object_id)
+    . "/" . Common::sanitizeForUrl($object->getTitle(), true)));
+} else {
+  $this->opengraph->attach(new Pair("url", "/document/" . urlencode($object_id)));
+}
 
 #$this->additional_css[] = "/a/document.css";
 require("./header.inc.phtml");

templates/Packet/View.phtml

@@ -12,15 +12,18 @@ $description = Common::stripUpTo(trim(filter_var(
   ($object ? $object->getPacketRemarks(true) : "The requested packet does not exist or could not be found."),
   FILTER_SANITIZE_STRING
 )), "\n", 300);
-$this->opengraph->attach(new Pair("url", "/packet/" . urlencode($object_id)));
 $this->opengraph->attach(new Pair("type", "article"));
 
 $url = Common::relativeUrlToAbsolute("/packet/" . urlencode($object_id));
 if ($object) {
   $url .= "/" . Common::sanitizeForUrl($object->getPacketName(), true);
+  $this->opengraph->attach(new Pair("url", "/packet/" . urlencode($object_id)
+    . "/" . Common::sanitizeForUrl($object->getPacketName(), true)));
 
   $packet_id = $object->getPacketId(true);
   $title = $packet_id . " " . $title;
+} else {
+  $this->opengraph->attach(new Pair("url", "/packet/" . urlencode($object_id)));
 }
 
 $this->additional_css[] = "/a/packet.css";