Changeset 488

Timestamp:

05/18/2007 05:44:30 AM (3 years ago)

Author:

DarTar

Message:

First draft of link tail support, refs #35

Files:

• trunk/libs/Wakka.class.php (modified) (7 diffs)

trunk/libs/Wakka.class.php

@@ -1702 +1702 @@
          * @param        boolean $escapeText optional:
          * @param        string $title optional:
+         * @param       string $class optional:
          * @return      string
          * @todo        i18n
-         * @todo        add class depending on link type
          * @todo        move regexps to regexp-library
-         * @todo        remove link tail (should be generated by the stylesheet)
-         */
-        function Link($tag, $handler='', $text='', $track=TRUE, $escapeText=TRUE, $title='')
+         */
+        function Link($tag, $handler='', $text='', $track=TRUE, $escapeText=TRUE, $title='', $class='')
         {
                 if (!$text)
@@ -1729 +1728 @@
                 {
                         $url = $this->GetInterWikiUrl($matches[1], $matches[2]);
+                        $class = 'interwiki';
                 }
                 elseif (preg_match('/^(http|https|ftp|news|irc|gopher):\/\/([^\\s\"<>]+)$/', $tag))
                 {
-                        $url = $tag; // this is a valid external URL
+                        $url = $tag;
+                        //add ext class only if URL is external
+                        if (!preg_match('/'.$_SERVER['SERVER_NAME'].'/', $tag))
+                        {
+                                $class = 'ext';
+                        }
                 }
                 // is this a full link? ie, does it contain something *else* than valid WikiName (alpha-numeric) characters?
@@ -1742 +1747 @@
                         {
                                 $url = 'mailto:'.$tag;
+                                $class = 'mailto';
                         }
                         // check for protocol-less URLs
@@ -1747 +1753 @@
                         {
                                 $url = 'http://'.$tag;
+                                $class = 'ext';
                         }
                 }
@@ -1759 +1766 @@
                         return ($linkedPage ? '<a href="'.$this->Href($handler, $linkedPage['tag']).'"'.$title_attr.'>'.$text.'</a>' : '<a class="missingpage" href="'.$this->Href("edit", $tag).'" title="'.CREATE_THIS_PAGE_LINK_TITLE.'">'.$text.'</a>'); #i18n
                 }
-                $external_link_tail = $this->GetConfigValue('external_link_tail');
-                return $url ? '<a class="ext" href="'.$url.'">'.$text.'</a>'.$external_link_tail : $text;
+                return $url ? '<a class="'.$class.'" href="'.$url.'">'.$text.'</a>' : $text;
         }
 
@@ -2205 +2211 @@
                 return ($user['show_comments'] == 'Y');
         }
-     /**
-     * Formatter for usernames.
-     *
-     * Renders usernames as links only when needed, avoiding the creation of missing page links 
-     * for users without userpage. Makes other options configurable (like truncating long 
-     * hostnames or disabling link formatting).
-     *
-     * @author        {@link http://www.wikkawiki.org/DarTar Dario Taraborelli} 
-     *
-     * @param    string    $user    required: name of user or hostname retrieved from the DB;
-     * @param    string    $link    optional: enables/disables linking to userpage;
-     * @param    string    $maxhostlength    optional: max length for hostname, hostnames longer
-     *                                 than this will be truncated with an ellipsis;
-     * @param    string    $ellipsis    optional: character to be use at the end of truncated hosts;
-     * @return string    $formatted_user: formatted username.
-     */
+         /**
+         * Formatter for usernames.
+         *
+         * Renders usernames as links only when needed, avoiding the creation of missing page links 
+         * for users without userpage. Makes other options configurable (like truncating long 
+         * hostnames or disabling link formatting).
+         *
+         * @author              {@link http://www.wikkawiki.org/DarTar Dario Taraborelli} 
+         *
+         * @param       string  $user   required: name of user or hostname retrieved from the DB;
+         * @param       string  $link   optional: enables/disables linking to userpage;
+         * @param       string  $maxhostlength  optional: max length for hostname, hostnames longer
+         *              than this will be truncated with an ellipsis;
+         * @param       string  $ellipsis       optional: character to be use at the end of truncated hosts;
+         * @return string       $formatted_user: formatted username.
+         */
         function FormatUser ($user, $link='1', $maxhostlength='10', $ellipsis='&#8230;')
         {
@@ -2284 +2290 @@
          * 
          * WARNING: Do not add, delete, or reorder records or fields in
-         *          queries prior to calling this function!!
+         *      queries prior to calling this function!!
          * @uses    Query()
          * @param       string $tablename mandatory: Table to modify