Changeset 1324 in ExiteCMS for modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/tracsvn_include.php

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

File:

• modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/tracsvn_include.php (modified) (3 diffs)

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;
 }