Changeset 2364 in ExiteCMS for branches/PLi-Fusion/forum/post.php

Timestamp:

07/29/10 17:16:11 (22 months ago)

Author:

root

Message:

merged trunk into branches PLi-Fusion and ITXP

File:

• branches/PLi-Fusion/forum/post.php (modified) (10 diffs)

branches/PLi-Fusion/forum/post.php

@@ -62 +62 @@
 // function to validate the contents of the $_POST array
 function validatepost() {
-    global $locale;
+    global $locale, $fdata;
 
     // we need both a subject and a message body
@@ -71 +71 @@
     if ($_POST['new_prefix'] == '[?]') $_POST['new_prefix'] = '';
 
+    // is a prefix required?
+    if ($fdata['forum_prefix'] && !empty($fdata['forum_prefixes']) && empty($_POST['new_prefix'])) {
+        return $locale['475'];
+    }
+
     return "";
 }
 
 // function to add or replace the prefix in the subject
-function subject_prefix($subject, $prefix) {
+function strip_prefix($subject) {
+
+    $result = array('subject' => '', 'prefix' => '');
+
+    // check for a reply, and strip the reply prefix
+    if (strtolower(substr($subject,0,3))=="re:") {
+        $result['subject'] = "Re: ";
+        $subject = trim(substr($subject,3));
+    }
+
+    // split the subject to check for a prefix
+    if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+        // a match must be at the beginning
+        if (empty($matches[1])) {
+            $result['prefix'] .= $matches[2];
+            $result['subject'] .= trim($matches[3]);
+        } else {
+            $result['subject'] .= $matches[0];
+        }
+    } else {
+        $result['subject'] .= $subject;
+    }
+
+    return $result;
+}
+
+// function to add or replace the prefix in the subject
+function add_prefix($subject, $prefix) {
 
     // was a prefix defined
@@ -83 +115 @@
 
         // split the subject to check for a prefix
-        if (!preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-        {
-            // was this a reply?
-            if (strtolower(substr($subject,0,3)) == 're:') {
-                $subject = 'Re: [' . $prefix . '] ' . substr($subject,4);
+        if (!preg_match('~(re:)(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+
+            if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+                if (empty($matches[1])) {
+                    $subject = '[' . $prefix . '] ' . trim($matches[3]);
             } else {
                 $subject = '[' . $prefix . '] ' . $subject;
             }
         } else {
-            // remove spaces from the matches
-            foreach($matches as $key => $value) {
-                $matches[$key] = trim($value);
-            }
-            unset($matches[0]);
-            $matches[2] = '[' . trim($prefix) . ']';
-            $subject = trim(implode(' ', $matches));
-        }
+                if (preg_match('~(re:)(.*)~i', $subject, $matches)) {
+                    $subject = 'Re: [' . $prefix . '] ' . trim($matches[2]);
+                } else {
+                    $subject = '[' . $prefix . '] ' . $subject;
+            }
+        }
+        } else {
+            $subject = 'Re: [' . $prefix . '] ' . trim($matches[4]);
+    }
     }
 
@@ -490 +523 @@
             $preview['post_subject'] = trim(stripinput(censorwords($_POST['subject'])));;
             if ($preview['post_subject'] == "" && isset($tdata) && is_array($tdata)) {
-                $preview['post_subject'] = "Re: ".$tdata['thread_subject'];
+                $preview['post_subject'] = add_prefix("Re: ".$tdata['thread_subject'], trim(stripinput($_POST['new_prefix'])));
             } else {
-                $preview['post_subject'] = subject_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
+                $preview['post_subject'] = add_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
             }
             $preview['post_message'] = trim(stripmessageinput(censorwords($_POST['message'])));
@@ -614 +647 @@
 // bail out if an edit is requested, but no edit rights have been detected
 if ($action == "edit" && !$user_can_edit) {
-    resultdialog($locale['408'], $locale['502']);
+    resultdialog($locale['408'], $locale['552']);
 } elseif (isset($_POST["cancel"])) {
     // post cancelled?
@@ -649 +682 @@
                     $smileys = isset($_POST['disable_smileys']) ? "0" : "1";
                     $subject = trim(stripinput(censorwords($_POST['subject'])));
+                    if (isset($tdata) && strtolower(substr($subject,0,3)) != "re:") {
                     if ($subject == "") {
                         $subject = "Re: ".$tdata['thread_subject'];
+                        } else {
+                            if ($action != "edit") {
+                                $subject = "Re: ".$subject;
                     }
-                    $subject = subject_prefix($subject, stripinput($_POST['new_prefix']));
+                        }
+                    }
+                    if ($fdata['forum_prefix']) {
+                        $subject = add_prefix($subject, stripinput($_POST['new_prefix']));
+                    }
                     $message = trim(stripmessageinput(censorwords($_POST['message'])));
                     if ($action == 'edit') {
                         // update the post record
                         if ($_POST['message'] == $_POST['org_message'])
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_smileys='$smileys' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_smileys='$smileys' WHERE post_id='$post_id'");
                         else {
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_message='$message', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_message='".mysql_real_escape_string($message)."', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
                         }
                         $data = dbarray(dbquery("SELECT * FROM ".$db_prefix."posts WHERE thread_id='$thread_id' ORDER BY post_datestamp ASC LIMIT 1"));
                         if ($data['post_id'] == $post_id) {
-                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='$subject' WHERE thread_id='$thread_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='".mysql_real_escape_string($subject)."' WHERE thread_id='$thread_id'");
                         }
                         // flag the forum and the thread as updated
@@ -808 +849 @@
                         rename(PATH_ATTACHMENTS.$attachment['attach_tmp'], PATH_ATTACHMENTS.$attachname);
                         chmod(PATH_ATTACHMENTS.$attachname,0664);
-                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '$attachname', '".$attachment['attach_name']."', '".$attachment['attach_comment']."', '$attachext', '".$attachment['attach_size']."')");
+                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '".mysql_real_escape_string($attachname)."', '".mysql_real_escape_string($attachment['attach_name'])."', '".mysql_real_escape_string($attachment['attach_comment'])."', '$attachext', '".$attachment['attach_size']."')");
                     }
                 }
@@ -1020 +1061 @@
             $variables['prefixes'] = array();
             foreach ($prefixes as $prefix) {
-                if (!empty($prefix)) $variables['prefixes'][] = trim($prefix);
+                $prefix = trim($prefix);
+                if (!empty($prefix)) $variables['prefixes'][] = $prefix;
             }
             if (!isset($title)) $title = $locale['415']." #".$reply_id;
@@ -1044 +1086 @@
             } elseif ($post_id > 0 || $reply_id > 0) {
                 $subject = $pdata['post_subject'];
-                // split the subject to check for a prefix
-                if (preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-                {
-                    // update the subject, set the prefixes
-                    $subject = trim($matches[3]);
-                    $variables['prefix'] = $matches[2];
-                    $variables['new_prefix'] = '['.$matches[2].']';
-                }
-                if ($action != "newthread" && strtolower(substr($subject,0,3)) != "re:") {
+                if (!in_array($action, array("edit","newthread")) && strtolower(substr($subject,0,3)) != "re:") {
                     $variables['subject'] = 'Re: '.$subject;
                 } else {
@@ -1088 +1122 @@
                 $bbcolor = "";
             }
+            // do we need to deal with a subject prefix
+            if (!isset($variables['prefix'])) {
+                $sparray = strip_prefix($variables['subject']);
+
+                $variables['subject'] = $sparray['subject'];
+                // check if it's a custom prefix
+                if (in_array($sparray['prefix'],$variables['prefixes'])) {
+                    $variables['prefix'] = $sparray['prefix'];
+                    $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                } else {
+                    if (empty($sparray['prefix'])) {
+                        $variables['prefix'] = '';
+                        $variables['new_prefix'] = '[?]';
+                    } else {
+                        $variables['prefix'] = '?';
+                        $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                    }
+                }
+            }
+
             // process attachments
             if ($settings['attachments'] == "1" && $fdata['forum_attach'] == "1") {