Changeset 1880

Timestamp:

07/24/2012 10:24:38 PM (10 months ago)

Author:

BrianKoontz

Message:

Permit the specification of forceLinkTracking in action calls that
will preserve linktracking such as with {{image}} links that point to
internal wiki pages. By default, forceLinkTracking remains disabled
for all action calls. Refs #1126.

Location:

trunk

Files:

• actions/image/image.php (modified) (1 diff)
• libs/Wakka.class.php (modified) (1 diff)

trunk/actions/image/image.php

@@ -26 +26 @@
  * @input int $width optional: width used to strech or shrink the image along its width
  * @input int $height optional: height used to strech or shrink the image along its height
+ * @input boolean $forceLinkTracking optional: use to create backlinks for images linking to other wiki pages default: FALSE 
  *
  * @output string img element or image link

trunk/libs/Wakka.class.php

@@ -3491 +3491 @@
                                         //                      to validate its own parameters!
                                         //                      That includes guarding against directory traversal.
-                                        $vars[$matches[1][$a]] = $this->htmlspecialchars_ent($matches[3][$a]);  // parameter name = sanitized value [SEC]
+                                        // Check to see if linktracking is desired (for
+                                        // instance, when using {{image}} tags to link to
+                                        // other wiki pages
+                                        if(FALSE !== strpos($matches[1][$a], "forceLinkTracking")) 
+                                        {
+                                                if(TRUE == $this->htmlspecialchars_ent($matches[3][$a]))
+                                                {
+                                                        $forceLinkTracking = 1; 
+                                                }
+                                                else
+                                                {
+                                                        $forceLinkTracking = 0;
+                                                }
+                                        }
+                                        else 
+                                        {
+                                                $vars[$matches[1][$a]] = $this->htmlspecialchars_ent($matches[3][$a]);  // parameter name = sanitized value [SEC]
+                                        }
                                 }
                         }