Changeset 1324 in ExiteCMS

Timestamp:

02/28/08 15:19:38 (4 years ago)

Author:

hverton

Message:

Added security to the SVN module\ncompleted the Trac-to-CMS user mapping

Location:

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn

Files:

• admin.php (modified) (6 diffs)
• module_installer.php (modified) (5 diffs)
• svn.php (modified) (1 diff)
• templates/modules.tracsvn.admin.tpl (modified) (2 diffs)
• templates/modules.tracsvn.side_panel.tpl (modified) (1 diff)
• templates/modules.tracsvn.svn.tpl (modified) (3 diffs)
• templates/modules.tracsvn.trac.tpl (modified) (4 diffs)
• tracsvn.side_panel.php (modified) (1 diff)
• tracsvn_include.php (modified) (3 diffs)

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/admin.php

@@ -25 +25 @@
 
 if (isset($_POST['savesettings'])) {
+
     // extract and validate the input
     $database = stripinput($_POST['database']);
@@ -31 +32 @@
     $auth = stripinput($_POST['auth']);
     $extensions = stripinput($_POST['extensions']);
+    $view_svn = isNum($_POST['view_svn']) ? $_POST['view_svn'] : 102;
+    $view_diff = isNum($_POST['view_diff']) ? $_POST['view_diff'] : 102;
+    $view_file = isNum($_POST['view_file']) ? $_POST['view_file'] : 102;
+    
     $variables['message'] = "";
-    
+
     // check if the database exists and is a Trac database
     if (empty($database) || !dbtable_exists("revision", $database)) {
@@ -65 +70 @@
         }
     }
+
     // if no errors are found, update
     if ($variables['message'] == "") {
@@ -72 +78 @@
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$auth."' WHERE cfg_name = 'tracsvn_svnauth'");
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$extensions."' WHERE cfg_name = 'tracsvn_extensions'");
+        $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$view_svn."' WHERE cfg_name = 'tracsvn_view_svn'");
+        $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$view_diff."' WHERE cfg_name = 'tracsvn_view_diff'");
+        $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$view_file."' WHERE cfg_name = 'tracsvn_view_file'");
         redirect(FUSION_SELF.$aidlink);
     }
+
+} elseif (isset($_POST['savealias'])) {
+
+    // process the selection
+    foreach($_POST['username'] as $idx => $user_id) {
+        if ($user_id) {
+            if ($_POST['orgmap'][$idx]) {
+                // update of a previous mapping
+                $result = dbquery("UPDATE ".$db_prefix."tracsvn_alias SET tracsvn_userid = '".$user_id."' WHERE tracsvn_username = '".stripinput($_POST['tracuser'][$idx])."'");
+            } else {
+                // new mapping
+                $result = dbquery("INSERT INTO ".$db_prefix."tracsvn_alias (tracsvn_userid, tracsvn_username) VALUES ('".$user_id."', '".stripinput($_POST['tracuser'][$idx])."')");
+            }
+        } else {
+            // no mapping for this trac user
+            $result = dbquery("DELETE FROM ".$db_prefix."tracsvn_alias WHERE tracsvn_username = '".stripinput($_POST['tracuser'][$idx])."'");
+        }
+    }
+    redirect(FUSION_SELF.$aidlink);
+
 } else {
+
+    // populate the fields for the settings panel
     $database = $settings['tracsvn_database'];
     $url = $settings['tracsvn_url'];
@@ -80 +111 @@
     $auth = $settings['tracsvn_svnauth'];
     $extensions = $settings['tracsvn_extensions'];
+    $view_svn = $settings['tracsvn_view_svn'];
+    $view_diff = $settings['tracsvn_view_diff'];
+    $view_file = $settings['tracsvn_view_file'];
+
+    // get the list of user groups
+    $groups = getusergroups();
+    $variables['usergroups'] = array();
+    foreach ($groups as $group) {
+        $variables['usergroups'][] = $group;
+    }
+
+    // get the information for the alias panel
+    $tracusers = array();
+
+    // if we have a valid Trac database configured...
+    if (!empty($database) && dbtable_exists("revision", $database)) {
+        // get the trac user accounts from the ticket table
+        $result = dbquery("SELECT DISTINCT owner, reporter FROM ".$settings['tracsvn_database'].".ticket");
+        while ($data = dbarray($result)) {
+            // add it to the users array, if not already present
+            if (!in_array($data['owner'], $tracusers)) {
+                $tracusers[] = $data['owner'];
+            }
+            if (!in_array($data['reporter'], $tracusers)) {
+                $tracusers[] = $data['reporter'];
+            }
+        }
+
+        // get the trac user accounts from the revisions table
+        $result = dbquery("SELECT DISTINCT author FROM ".$settings['tracsvn_database'].".revision");
+        while ($data = dbarray($result)) {
+            // add it to the users array, if not already present
+            if (!in_array($data['author'], $tracusers)) {
+                $tracusers[] = $data['author'];
+            }
+        }
+
+        // sort the users
+        sort($tracusers);
+    }
+
+    // get the alias mapping for this users
+    $variables['aliases'] = array();
+    foreach($tracusers as $tracuser) {
+        $result = dbquery("SELECT t.*, u.user_name FROM ".$db_prefix."tracsvn_alias t, ".$db_prefix."users u WHERE t.tracsvn_userid = u.user_id AND tracsvn_username = '$tracuser'");
+        if (dbrows($result)) {
+            $data = dbarray($result);
+            $variables['aliases'][] = array('tracuser' => $tracuser, 'user_id' => $data['tracsvn_userid'], 'user_name' => $data['user_name']);
+        } else {
+            $variables['aliases'][] = array('tracuser' => $tracuser, 'user_id' => 0, 'user_name' => "");
+        }
+    }
+
+    // get the list of all users for the dropdown
+    $variables['members'] = array();
+    $result = dbquery("SELECT user_id, user_name FROM ".$db_prefix."users WHERE user_status = '0' ORDER BY user_name");
+    while ($data = dbarray($result)) {
+        $variables['members'][] = $data;
+    }
 }
-
+//_debug($variables, true);
 // store the variables
 $variables['database'] = $database;
@@ -88 +178 @@
 $variables['auth'] = $auth;
 $variables['extensions'] = $extensions;
+$variables['view_svn'] = $view_svn;
+$variables['view_diff'] = $view_diff;
+$variables['view_file'] = $view_file;
 
 // define the body panel variables

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/module_installer.php

@@ -72 +72 @@
 $localestrings['en']['406'] = "Database not found, no access to database, or database is not a Trac database";
 $localestrings['en']['407'] = "Trac & SVN user aliases";
-$localestrings['en']['408'] = "Add alias";
+$localestrings['en']['408'] = "Save aliases";
 $localestrings['en']['409'] = "There are no aliases defined";
 $localestrings['en']['410'] = "Save settings";
 $localestrings['en']['411'] = "Trac MySQL database name:";
 $localestrings['en']['412'] = "Trac username";
-$localestrings['en']['413'] = "Member";
+$localestrings['en']['413'] = "Member Name";
 $localestrings['en']['414'] = "Milestone";
 $localestrings['en']['415'] = "";
@@ -114 +114 @@
 $localestrings['en']['448'] = "Generate diffs for file extensions:";
 $localestrings['en']['449'] = "Could not connect to the SVN repository. Output of the command is:<br />";
+$localestrings['en']['450'] = "View SubVersion information:";
+$localestrings['en']['451'] = "View SVN commit diffs:";
+$localestrings['en']['452'] = "View SVN source files:";
 
 $localestrings['en']['500'] = "Changeset";
@@ -144 +147 @@
 $localestrings['nl']['406'] = "Database niet gevonden, geen toegang tot de database, of de database is geen Trac database";
 $localestrings['nl']['407'] = "Trac & SVN gebruikersaliassen";
-$localestrings['nl']['408'] = "Alias toevoegen";
+$localestrings['nl']['408'] = "Aliasen aanpassen";
 $localestrings['nl']['409'] = "Er zijn geen aliassen gedefinieerd";
 $localestrings['nl']['410'] = "Bewaar instellingen";
 $localestrings['nl']['411'] = "Trac MySQL database naam:";
 $localestrings['nl']['412'] = "Trac gebruiker";
-$localestrings['nl']['413'] = "Lid";
+$localestrings['nl']['413'] = "Lid naam";
 $localestrings['nl']['414'] = "Mijlpaal";
 $localestrings['nl']['415'] = "Opgeleverd op";
@@ -186 +189 @@
 $localestrings['nl']['448'] = "Genereer diffs voor deze file extensies:";
 $localestrings['nl']['449'] = "Kan geen verbinding maken met de SVN repository. Uitvoer van het commando is:<br />";
+$localestrings['nl']['450'] = "SubVersion informatie bekijken:";
+$localestrings['nl']['451'] = "SVN commit diffs bekijken:";
+$localestrings['nl']['452'] = "SVN bron bestanden bekijken:";
 
 $localestrings['nl']['500'] = "Changeset";
@@ -219 +225 @@
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_svnauth', '--username name_here --password pass_here')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_extensions', 'php,tpl,sh')");
+$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_view_svn', '102')");
+$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_view_diff', '102')");
+$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_view_file', '102')");
 
 // create the table: tracsvn_alias
 $mod_install_cmds[] = array('type' => 'db', 'value' => "CREATE TABLE ##PREFIX##tracsvn_alias (
-  tracsvn_id mediumint(8) unsigned NOT NULL default '0',
+  tracsvn_id mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   tracsvn_userid mediumint(8) unsigned NOT NULL default '0',
   tracsvn_username varchar(50) NOT NULL default '',

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/svn.php

@@ -28 +28 @@
 
 // get the rights for the current user
-$variables['view_svn'] = true;
+$variables['view_svn'] = iMEMBER && checkgroup($settings['tracsvn_view_svn']);
 if (!$variables['view_svn']) {
     // redirect back to the trac module 
     redirect("trac.php");
 }
-$variables['view_diff'] = true;
-$variables['view_file'] = true;
+$variables['view_diff'] = iMEMBER && checkgroup($settings['tracsvn_view_diff']);
+$variables['view_file'] = iMEMBER && checkgroup($settings['tracsvn_view_file']);
 
 // check if we have a revision number

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.admin.tpl

@@ -65 +65 @@
             </td>
         </tr>
+
+        <tr>
+            <td width='50%' class='tbl'>
+                {$locale.450}
+            </td>
+            <td width='50%' class='tbl'>
+                <select name='view_svn' class='textbox'>
+                {section name=id loop=$usergroups}
+                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $view_svn} selected="selected"{/if}>{$usergroups[id].1}</option>
+                {/section}
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td width='50%' class='tbl'>
+                {$locale.451}
+            </td>
+            <td width='50%' class='tbl'>
+                <select name='view_diff' class='textbox'>
+                {section name=id loop=$usergroups}
+                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $view_diff} selected="selected"{/if}>{$usergroups[id].1}</option>
+                {/section}
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td width='50%' class='tbl'>
+                {$locale.452}
+            </td>
+            <td width='50%' class='tbl'>
+                <select name='view_file' class='textbox'>
+                {section name=id loop=$usergroups}
+                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $view_file} selected="selected"{/if}>{$usergroups[id].1}</option>
+                {/section}
+                </select>
+            </td>
+        </tr>
         <tr>
             <td align='center' colspan='2' class='tbl'>
@@ -75 +112 @@
 {include file="_closetable.tpl"}
 {include file="_opentable.tpl" name=$_name title=$locale.407 state=$_state style=$_style}
-<table align='center' cellpadding='0' cellspacing='1' class='tbl-border' width='500'>
-    <tr>
-        <td class='tbl2' align='center'>
-            {$locale.412}
-        </td>
-        <td class='tbl2' align='center'>
-            {$locale.413}
-        </td>
-    </tr>
-    {section name=id loop=$aliases}
+<form name='aliasform' method='post' action='{$smarty.const.FUSION_SELF}{$aidlink}'>
+    <table align='center' cellpadding='0' cellspacing='1' class='tbl-border' width='500'>
         <tr>
-            <td class='tbl1' align='center'>
+            <td class='tbl2' width='50%' align='center'>
+                <b>{$locale.412}</b>
             </td>
-            <td class='tbl1' align='center'>
+            <td class='tbl2' width='50%' align='center'>
+                <b>{$locale.413}</b>
             </td>
         </tr>
-    {sectionelse}
+        {section name=id loop=$aliases}
+            <tr>
+                <td class='tbl1' align='center'>
+                    {$aliases[id].tracuser}
+                    <input type='hidden' name='tracuser[]' value='{$aliases[id].tracuser}' />
+                    <input type='hidden' name='orgmap[]' value='{$aliases[id].user_id}' />
+                </td>
+                <td class='tbl1' align='center'>
+                    <select name='username[]' class='textbox' style='width:200px;'>
+                        <option value='0'{if $aliases[id].user_id == 0} selected='selected'{/if}></option>
+                        {section name=usr loop=$members}
+                            <option value='{$members[usr].user_id}'{if $aliases[id].user_id == $members[usr].user_id} selected='selected'{/if}>{$members[usr].user_name}</option>
+                        {/section}
+                    </section>
+                </td>
+            </tr>
+        {sectionelse}
+            <tr>
+                <td class='tbl1' colspan='2' align='center'>
+                    {$locale.409}
+                </td>
+            </tr>
+        {/section}
+    </table>
+    <br />
+    <table align='center' cellpadding='0' cellspacing='0' width='500'>
         <tr>
-            <td class='tbl1' colspan='2' align='center'>
-                {$locale.409}
+            <td align='center' colspan='2' class='tbl'>
+                <input type='submit' name='savealias' value='{$locale.408}' class='button' />
             </td>
         </tr>
-    {/section}
-</table>
-<br />
-<table align='center' cellpadding='0' cellspacing='0' width='500'>
-    <tr>
-        <td align='center' colspan='2' class='tbl'>
-            <input type='submit' name='addalias' value='{$locale.408}' class='button' />
-        </td>
-    </tr>
-</table>
+    </table>
+</form>
 {include file="_closetable.tpl"}
 {***************************************************************************}

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.side_panel.tpl

@@ -26 +26 @@
             <br />
             <span class='small'>{$locale.404}</span> 
-            <b>{$dev}</b>
+            <b>{$dev.user_name}</b>
         </div>
     {else}

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.svn.tpl

@@ -105 +105 @@
             </td>
             <td class='tbl' align='left'>
-                {$revs.author}
+                {if $revs.author.user_id}
+                    <a href='{$smarty.const.BASEDIR}profile.php?lookup={$revs.author.user_id}' title=''>{$revs.author.user_name}</a>
+                {else}
+                    {$revs.author.user_name}
+                {/if}
             </td>
         </tr>
@@ -135 +139 @@
                         <div style='float:left;background-color:#ffffff;height:7px;width:7px;margin-top:3px;margin-right:4px;border:1px solid #000;'></div>
                     {/if}
-                    {if $nodes[id].change_type != "D"}          {* No links to deleted files *}
+                    {if $nodes[id].change_type != "D" && $view_file}
                         <a href='{$smarty.const.FUSION_SELF}?rev={$rev}&amp;file={$nodes[id].path}' title='{$locale.517}'>{$nodes[id].s_path}</a>
                     {else}
@@ -259 +263 @@
                 <span class='small'>{$revs[id].time|date_format:"%H:%M"}</span>
             </td>
-            <td class='tbl'>
+            <td class='tbl2'>
                 {$locale.500}
-                <a href='{$smarty.const.FUSION_SELF}?rev={$revs[id].rev}' title='{$locale.516}'>[{$revs[id].rev}]</a>
-                {$locale.404} {$revs[id].author}
-                <br />
-                {$revs[id].message}
-            </td>
-        </tr>
-
+                [<a href='{$smarty.const.FUSION_SELF}?rev={$revs[id].rev}' title='{$locale.516}'>{$revs[id].rev}</a>]
+                {$locale.404}
+                {if $revs[id].author.user_id}
+                    <a href='{$smarty.const.BASEDIR}profile.php?lookup={$revs[id].author.user_id}' title=''>{$revs[id].author.user_name}</a>
+                {else}
+                    {$revs[id].author.user_name}
+                {/if}
+            </td>
+        </tr>
+        <tr>
+            <td class='tbl2' align='right' valign='top' width='1%' style='white-space:nowrap;'>
+            </td>
+            <td class='tbl' >
+                <div style='float;white-space:nowrap;overflow:auto'><img src='{$smarty.const.THEME}images/bullet.gif' alt='' /> {$revs[id].message}</div>
+            </td>
+        </tr>
     {sectionelse}
     {/section}

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.trac.tpl

@@ -169 +169 @@
             </td>
             <td class='tbl1' align='left'>
-                {$ticket.reporter}
+                {if $ticket.reporter.user_id}
+                    <a href='{$smarty.const.BASEDIR}profile.php?lookup={$ticket.reporter.user_id}' title=''>{$ticket.reporter.user_name}</a>
+                {else}
+                    {$ticket.reporter.user_name}
+                {/if}
             </td>
             <td class='tbl2' align='left'>
@@ -175 +179 @@
             </td>
             <td class='tbl1' align='left'>
-                {$ticket.owner}
+                {if $ticket.owner.user_id}
+                    <a href='{$smarty.const.BASEDIR}profile.php?lookup={$ticket.owner.user_id}' title=''>{$ticket.owner.user_name}</a>
+                {else}
+                    {$ticket.owner.user_name}
+                {/if}
             </td>
         </tr>
@@ -240 +248 @@
             <tr>
                 <td class='tbl2'>
-                    <span style='small'>{$changes[id].time|date_format:"forumdate"}  - {$locale.441} {$locale.404} {$changes[id].author}</span>
+                    <span style='small'>
+                        {$changes[id].time|date_format:"forumdate"}  - {$locale.441} {$locale.404}
+                        {if $changes[id].author.user_id}
+                            <a href='{$smarty.const.BASEDIR}profile.php?lookup={$changes[id].author.user_id}' title=''>{$changes[id].author.user_name}</a>
+                        {else}
+                            {$changes[id].author.user_name}
+                        {/if}
+                    </span>
                 </td>
             </tr>
@@ -248 +263 @@
                         {$changes[id].newvalue}
                     {elseif $changes[id].oldvalue == ""}
-                        <img src='{$smart.const.THEME}/images/bullet.gif' alt='' /> <b>{$changes[id].field}</b> {$locale.441} {$locale.443} </span class='small2'>{$changes[id].newvalue}</span>
+                        <img src='{$smart.const.THEME}/images/bullet.gif' alt='' /> <b>{$changes[id].field}</b> {$locale.441} {$locale.443} <span class='small2'>{$changes[id].newvalue}</span>
                     {else}
-                        <img src='{$smart.const.THEME}/images/bullet.gif' alt='' />  <b>{$changes[id].field}</b> {$locale.441} {$locale.442} <span class='small2'>{$changes[id].oldvalue}</span> {$locale.443} </span class='small2'>{$changes[id].newvalue}</span>
+                        <img src='{$smart.const.THEME}/images/bullet.gif' alt='' />  <b>{$changes[id].field}</b> {$locale.441} {$locale.442} <span class='small2'>{$changes[id].oldvalue}</span> {$locale.443} <span class='small2'>{$changes[id].newvalue}</span>
                     {/if}
                 </td>

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/tracsvn.side_panel.php

@@ -24 +24 @@
         $variables['rev'] = $data['rev'];
         $variables['date'] = $data['time'];
-        // translate SVN users to ExiteCMS users if needed
-        $result = dbquery("SELECT u.user_name FROM ".$db_prefix."users u, ".$db_prefix."tracsvn_alias t WHERE t.tracsvn_userid = u.user_id AND t.tracsvn_username = '".$data['author']."'"); 
-        if (dbrows($result)) {
-            $data = dbarray($result);
-            $variables['dev'] = $data['user_name'];
-        } else {
-            $variables['dev'] = tracsvn_getalias($data['author']);
-        }
+        $variables['dev'] = tracsvn_getalias($data['author']);
     }
 }

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/tracsvn_include.php

@@ -39 +39 @@
 function tracsvn_wiki2html($text) {
 
-    // get rid of double line breaks
-    $text = str_replace("[[BR]]\r\n", "", $text);
+    // get rid of trailing whitespace
+    $text = rtrim($text);
     // bullit implies line break
-    $text = str_replace("\r\*", "\*", $text);
+    $text = str_replace("\r\n*", "*", $text);
+    $text = str_replace("[[BR]]*", "*", $text);
     // bullet lists
+    $text = str_replace("\r\n *", "<br />*", $text);
     $text = preg_replace("/\*\s(.*?)(\w)/i", "&bull; \\1\\2", $text);
-    // line breaks
-    $text = str_replace("\r\n", "<br />", $text);
+    // convert linebreaks
+    if (FUSION_SELF == "trac.php") {
+        $text = str_replace("\r\n", "<br />", $text);
+        $text = str_replace("\n", "<br />", $text);
+    } else {
+        $text = str_replace("\r\n", "<br /><img src='".THEME."images/bullet.gif' alt=\"\" /> ", $text);
+        $text = str_replace("\n", "<br /><img src='".THEME."images/bullet.gif' alt=\"\" /> ", $text);
+    }
+    // forced line breaks
+    $text = str_replace("[[BR]]", "<br />", $text);
     // strike-through
     $text = preg_replace("/~~(.*?)~~/si", "<span style='text-decoration:line-through;'>\\1</span>", $text);
@@ -71 +81 @@
         $text = preg_replace("/#([0-9]+)/si", "#<a href='trac.php?step=ticket&amp;id=\\1' title=''>\\1</a>", $text);
     }
+    $text = preg_replace("/rev. ([0-9]+)/i", "rev. <a href='svn.php?rev=\\1' title=''>\\1</a>", $text);
     
     // return the converted text    
@@ -82 +93 @@
     
     // validate the parameter
-    if (!empty($tracname) && !is_string($tracname)) {
+    if (!empty($tracname) && is_string($tracname)) {
         // translate Trac/SVN users to ExiteCMS users if needed
-        $result = dbquery("SELECT u.user_name FROM ".$db_prefix."users u, ".$db_prefix."tracsvn_alias t WHERE t.tracsvn_userid = u.user_id AND t.tracsvn_username = '$tracname' LIMIT 1"); 
+        $result = dbquery("SELECT u.user_id, u.user_name FROM ".$db_prefix."users u, ".$db_prefix."tracsvn_alias t WHERE t.tracsvn_userid = u.user_id AND t.tracsvn_username = '$tracname' LIMIT 1"); 
         if (dbrows($result)) {
-            $data = dbarray($result);
-            $tracname = $data['user_name'];
-        }
-    }
-
-    // test code!!!
-    if ($tracname == "hverton") $tracname = "WanWizard";
-    if ($tracname == "root") $tracname = "Webmaster";
-    
+            $tracname = dbarray($result);
+        }
+    }
+    // not found? maybe there's a direct link with a member
+    if (!is_array($tracname)) {
+        // check the users table
+        $result = dbquery("SELECT user_id, user_name FROM ".$db_prefix."users WHERE user_name = '$tracname' LIMIT 1"); 
+        if (dbrows($result)) {
+            $tracname = dbarray($result);
+        }
+    }
+
+    // still not found? Use the tracname
+    if (!is_array($tracname)) {
+        $tracname = array('user_id' => '0', 'user_name' => $tracname);
+    }
+        
     return $tracname;
 }