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

Timestamp:

07/02/08 18:27:06 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1408:1508 into the PLi-Fusion branch

File:

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

branches/PLi-Fusion/forum/post.php

@@ -122 +122 @@
         // if it's an image, see if we need to make a thumbnail
         if (in_array($attachext, $imagetypes)) {
-            if (@getimagesize($tmp_name) && @verify_image($tmp_name)) {
+            if (@verify_image($tmp_name)) {
                 // it's a valid image. See if we need to generate a thumbnail
                 $imagefile = @getimagesize($tmp_name);
@@ -424 +424 @@
                     $preview['cc_flag'] = GeoIP_Code2Flag($settings['country']);
                 } else {
-                    $preview['cc_flag'] = GeoIP_IP2Flag($userdata['user_ip']);
+                    $preview['cc_flag'] = !empty($userdata['user_cc']) ? GeoIP_Code2Flag($userdata['user_cc']) : GeoIP_IP2Flag($userdata['user_ip']);
                 }
             } else {
@@ -434 +434 @@
             $preview['post_edituser'] = 0;
             $preview['post_ip'] = $userdata['user_ip'];
+            $preview['post_cc'] = $userdata['user_cc'];
             $preview['group_names'] = array();
             $preview['group_names'][] = array('type' => 'U', 'level' => $userdata['user_level'], 'name' => getuserlevel($userdata['user_level']));
@@ -599 +600 @@
                         }
                         // check if this isn't a reload, back-post, or double submit
-                        if (isset($_COOKIE['post_'.$random_id])) {
+                        if (isset($_SESSION['posts'][$random_id])) {
                             $error = $locale['458'];
                         } else {
                             if (!$flood) {
-                                setcookie("post_".$random_id, "posted", time()+60*60, "/", "", "0");
+                                if (!isset($_SESSION['posts']) || !is_array($_SESSION['posts'])) $_SESSION['posts'] = array();
+                                $_SESSION['posts'][$random_id] = time()+60*60*12;
                                 $result = dbquery("UPDATE ".$db_prefix."forums SET forum_lastpost='".time()."', forum_lastuser='".$userdata['user_id']."' WHERE forum_id='$forum_id'");
                                 switch ($action) {
@@ -616 +618 @@
                                         break;
                                 }
-                                $result = dbquery("INSERT INTO ".$db_prefix."posts (forum_id, thread_id, post_reply_id, post_subject, post_message, post_showsig, post_smileys, post_author, post_datestamp, post_ip, post_edituser, post_edittime) VALUES ('$forum_id', '$thread_id', '$reply_id', '$subject', '$message', '$sig', '$smileys', '".$userdata['user_id']."', '".time()."', '".USER_IP."', '0', '0')");
+                                $result = dbquery("INSERT INTO ".$db_prefix."posts (forum_id, thread_id, post_reply_id, post_subject, post_message, post_showsig, post_smileys, post_author, post_datestamp, post_ip, post_cc, post_edituser, post_edittime) VALUES ('$forum_id', '$thread_id', '$reply_id', '$subject', '$message', '$sig', '$smileys', '".$userdata['user_id']."', '".time()."', '".USER_IP."', '".$userdata['user_cc']."', '0', '0')");
                                 $post_id = mysql_insert_id();
                                 $result = dbquery("UPDATE ".$db_prefix."users SET user_posts=user_posts+1 WHERE user_id='".$userdata['user_id']."'");
@@ -931 +933 @@
                     case "edit":
                         $variables['message'] = $pdata['post_message'];
-                        $variables['org_message'] = $pdata['post_message'];
                         break;
                     case "quote":
                         $variables['message'] = $variables['orgauthor'] == "" ? "[quote]" : "[quote=".$variables['orgauthor']."]";
                         $variables['message'] .= $pdata['post_message']."[/quote]";
-                        $variables['org_message'] = "";
                         break;
                     default:
                         $variables['message'] = "";
-                        $variables['org_message'] = "";
-                }
+                }
+                $variables['org_message'] = $pdata['post_message'];
                 $variables['post_author'] = $pdata['post_author'];
                 $variables['is_smiley_disabled'] = ($pdata['post_smileys'] == "0");