Merge pull request #180 from quantacms/aldo-dev

Aldo dev
quantacms · Nov 1, 2018 · 393389a · 393389a
2 parents 071a210 + 75b9c4b
commit 393389a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/engine/modules/core/environment/Environment.class.inc b/engine/modules/core/environment/Environment.class.inc
@@ -356,11 +356,16 @@ class Environment extends DataContainer {
   }
 
   /**
-   * Hook function - will look for all modulename_function in all active modules.
+   * Hook function - will look for all modulename_function in all active modules
+   * and let the user alter the variables contained into &$vars.
    *
-   * @param $function
+   * @param string $function
+   *   The hook function name.
    * @param array $vars
+   *   An array of variables.
+   *
    * @return bool
+   *   Returns TRUE if any module was implementing the hook.
    */
   public function hook($function, &$vars = array()) {
     $env = &$this;

diff --git a/engine/modules/core/node/node.qtags.inc b/engine/modules/core/node/node.qtags.inc
@@ -157,7 +157,7 @@ function qtag_ATTRIBUTE($env, $target, &$attributes) {
  * @return string
  *   The rendered qtag.
  *
- * TODO: we should make Links an object oriented / class item.
+ * TODO: we should really make Link a class.
  */
 function qtag_LINK($env, $target, &$attributes) {
   $querystring = array();
@@ -167,6 +167,9 @@ function qtag_LINK($env, $target, &$attributes) {
   $link_data = array();
   $link_id = !empty($attributes['link_id']) ? $attributes['link_id'] : '';
 
+  // Add support for protocol (http, https etc.).
+  $protocol = !(empty($attributes['protocol'])) ? ($attributes['protocol'] . '://') : '';
+
   $classes = array('link');
 
   // Check if the target is a node or an external link.
@@ -242,7 +245,7 @@ function qtag_LINK($env, $target, &$attributes) {
 
   $title = isset($attributes['title']) ? $attributes['title'] : $title_default;
   // Create the link HTML.
-  $link = '<a ' . $id . ' ' . implode(' ', $link_data) . ' class="' . implode(' ', $classes) . '" ' . $link_title . ' href="' . $target . $query . '" ' . $link_target . '>' . $title . '</a>';
+  $link = '<a ' . $id . ' ' . implode(' ', $link_data) . ' class="' . implode(' ', $classes) . '" ' . $link_title . ' href="' . $protocol . $target . $query . '" ' . $link_target . '>' . $title . '</a>';
   return $link;
 }
 

diff --git a/engine/modules/core/qtags/qtags.hook.inc b/engine/modules/core/qtags/qtags.hook.inc
@@ -10,7 +10,6 @@
 function qtags_page_complete($env, $vars) {
   $html = transformCodeTags($env, $vars['page']->html);
   $html = transformCodeTags($env, $html, array('runlast' => TRUE));
-
   $vars['page']->html = $html;
 }
 

diff --git a/engine/modules/core/sitemap/sitemap.hook.inc b/engine/modules/core/sitemap/sitemap.hook.inc
@@ -8,7 +8,7 @@
  *   An array of variables.
  */
 function sitemap_boot($env, $vars) {
-  // TODO: object oriented, using templates, etc. etc.
+  // TODO: refactor with object oriented approach, using templates, etc. etc.
   if ($env->getRequestedPath() == 'google_sitemap') {
     header("Content-type: text/xml");