Changeset 1700 in ExiteCMS for trunk/pm.php

Timestamp:

08/26/08 15:34:37 (4 years ago)

Author:

hverton

Message:

added the WYSIWYG BBcode editor option to private messages and the user profile (to edit the users signature)

File:

• trunk/pm.php (modified) (2 diffs)

trunk/pm.php

@@ -882 +882 @@
                 $variables['subject'] = (!strstr($data['pm_subject'], "RE: ") ? "RE: " : "").$data['pm_subject'];
                 $variables['org_message'] = $data['pm_message'];
-                if ($action != "reply") {
+                $variables['orgauthor'] = "";
+                if ($action != "post") {
                     if ($data['pmindex_user_id'] == $data['pmindex_to_id'] || $data['pmindex_to_id'] == 0)
                         $result2 = dbquery("SELECT user_name FROM ".$db_prefix."users WHERE user_id = '".$data['pmindex_from_id']."'");
@@ -889 +890 @@
                     if ($result2) {
                         $data2 = dbarray($result2);
-                        $variables['message'] = "[quote=".$data2['user_name']."]".$variables['org_message']."[/quote]";
+                        if ($action == "quote") {
+                            $variables['message'] = "[quote=".$data2['user_name']."]".$variables['org_message']."[/quote]";
+                        } else if ($action == "forward") {
+                            $variables['message'] = $variables['org_message'];
+                        }
+                        $variables['orgauthor'] = $data2['user_name'];
                     } else {
-                        $variables['message'] = "[quote]".$variables['org_message']."[/quote]";
+                        if ($action == "quote") {
+                            $variables['message'] = "[quote]".$variables['org_message']."[/quote]";
+                        } else if ($action == "forward") {
+                            $variables['message'] = $variables['org_message'];
+                        }
                     }
                 }