Changeset 1529

Timestamp:

02/24/08 23:48:26 (5 months ago)

Author:

Neal

Message:

Added missing parameters to pun_link calls in moderate.php and post.php.
Added more queries to moderate.php to get required data for aforementioned change.
Added more validation of input using the new queries.

Files:

• branches/punbb-1.3-dev/upload/moderate.php (modified) (22 diffs)
• branches/punbb-1.3-dev/upload/post.php (modified) (1 diff)

branches/punbb-1.3-dev/upload/moderate.php

@@ -112 +112 @@
-// Did someone click a cancel button?
-if (isset($_POST['cancel']))
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-
-
@@ -123 +123 @@
-        if ($tid < 1)
-                message($lang_common['Bad request']);
-
-        // User pressed the cancel button
-        if (isset($_POST['delete_posts_cancel']))
-                redirect(pun_link($pun_url['topic'], $tid), $lang_common['Cancel redirect']);
-
-        // Fetch some info about the topic
@@ -142 +138 @@
-        $cur_topic = $db->fetch_assoc($result);
-
+        // User pressed the cancel button
+        if (isset($_POST['delete_posts_cancel']))
+                redirect(pun_link($pun_url['topic'], array($tid, sef_friendly($cur_topic['subject']))), $lang_common['Cancel redirect']);
+
-        // Delete one or more posts
-        if (isset($_POST['delete_posts']) || isset($_POST['delete_posts_comply']))
@@ -154 +154 @@
-                {
-                        if (!isset($_POST['req_confirm']))
-$tid
+array($tid, sef_friendly($cur_topic['subject']))
-
-                        ($hook = get_hook('mr_confirm_delete_posts_form_submitted')) ? eval($hook) : null;
@@ -216 +216 @@
-                        sync_forum($fid);
-
-$tid
+array($tid, sef_friendly($cur_topic['subject']))
-                }
-
@@ -231 +231 @@
-                $pun_page['crumbs'] = array(
-                        array($pun_config['o_board_title'], pun_link($pun_url['index'])),
-$fid
-$tid
+array($fid, sef_friendly($cur_forum['forum_name']))
+array($tid, sef_friendly($cur_topic['subject']))
-                        $lang_misc['Delete posts']
-                );
@@ -320 +320 @@
-        $pun_page['crumbs'] = array(
-                array($pun_config['o_board_title'], pun_link($pun_url['index'])),
-$fid
-$tid
+array($fid, sef_friendly($cur_forum['forum_name']))
+array($tid, sef_friendly($cur_topic['subject']))
-                $lang_topic['Delete posts']
-        );
@@ -500 +500 @@
-                        message($lang_common['Bad request']);
-
+                // Fetch the forum name for the forum we're moving to
+                $query = array(
+                        'SELECT'        => 'f.forum_name',
+                        'FROM'          => 'forums AS f',
+                        'WHERE'         => 'f.id='.$move_to_forum
+                );
+
+                ($hook = get_hook('mr_qr_get_move_to_forum_name')) ? eval($hook) : null;
+                $result = $db->query_build($query) or error(__FILE__, __LINE__);
+
+                if (!$db->num_rows($result))
+                        message($lang_common['Bad request']);
+
+                $move_to_forum_name = $db->result($result);
+
-                // Verify that the topic IDs are valid
-                $query = array(
@@ -563 +578 @@
-
-                $pun_page['redirect_msg'] = (count($topics) > 1) ? $lang_misc['Move topics redirect'] : $lang_misc['Move topic redirect'];
-$move_to_forum
+array($move_to_forum, sef_friendly($move_to_forum_name))
-        }
-
@@ -590 +605 @@
-                );
-
-
+to_move_
-                $result = $db->query_build($query) or error(__FILE__, __LINE__);
+
+                if (!$db->num_rows($result))
+                        message($lang_common['Bad request']);
+
-                $subject = $db->result($result);
-        }
@@ -635 +654 @@
-        // Setup breadcrumbs
-        $pun_page['crumbs'][] = array($pun_config['o_board_title'], pun_link($pun_url['index']));
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-        if ($action == 'single')
-$topics
+array($topics, sef_friendly($subject))
-        else
-                $pun_page['crumbs'][] = array($lang_misc['Moderate forum'], pun_link($pun_url['moderate_forum'], $fid));
@@ -718 +737 @@
-        {
-                if (!isset($_POST['req_confirm']))
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-
-                ($hook = get_hook('mr_confirm_delete_topics_form_submitted')) ? eval($hook) : null;
@@ -790 +809 @@
-                sync_forum($fid);
-
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-        }
-
@@ -806 +825 @@
-        $pun_page['crumbs'] = array(
-                array($pun_config['o_board_title'], pun_link($pun_url['index'])),
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-                array($lang_misc['Moderate forum'], pun_link($pun_url['moderate_forum'], $fid)),
-                $lang_misc['Delete topics']
@@ -888 +907 @@
-                        csrf_confirm_form();
-
+                // Get the topic subject
+                $query = array(
+                        'SELECT'        => 't.subject',
+                        'FROM'          => 'topics AS t',
+                        'WHERE'         => 't.id='.$topic_id.' AND forum_id='.$fid
+                );
+
+                ($hook = get_hook('mr_qr_get_open_close_topic_subject')) ? eval($hook) : null;
+                $result = $db->query_build($query) or error(__FILE__, __LINE__);
+
+                if (!$db->num_rows($result))
+                        message($lang_common['Bad request']);
+
+                $subject = $db->result($result);
+
-                $query = array(
-                        'UPDATE'        => 'topics',
@@ -898 +932 @@
-
-                $pun_page['redirect_msg'] = ($action) ? $lang_misc['Close topic redirect'] : $lang_misc['Open topic redirect'];
-$topic_id
+array($topic_id, sef_friendly($subject))
-        }
-}
@@ -917 +951 @@
-        ($hook = get_hook('mr_stick_topic_selected')) ? eval($hook) : null;
-
+        // Get the topic subject
+        $query = array(
+                'SELECT'        => 't.subject',
+                'FROM'          => 'topics AS t',
+                'WHERE'         => 't.id='.$stick.' AND forum_id='.$fid
+        );
+
+        ($hook = get_hook('mr_qr_get_stick_topic_subject')) ? eval($hook) : null;
+        $result = $db->query_build($query) or error(__FILE__, __LINE__);
+
+        if (!$db->num_rows($result))
+                message($lang_common['Bad request']);
+
+        $subject = $db->result($result);
+
-        $query = array(
-                'UPDATE'        => 'topics',
@@ -926 +975 @@
-        $db->query_build($query) or error(__FILE__, __LINE__);
-
-$stick
+array($stick, sef_friendly($subject))
-}
-
@@ -944 +993 @@
-        ($hook = get_hook('mr_unstick_topic_selected')) ? eval($hook) : null;
-
+        // Get the topic subject
+        $query = array(
+                'SELECT'        => 't.subject',
+                'FROM'          => 'topics AS t',
+                'WHERE'         => 't.id='.$unstick.' AND forum_id='.$fid
+        );
+
+        ($hook = get_hook('mr_qr_get_unstick_topic_subject')) ? eval($hook) : null;
+        $result = $db->query_build($query) or error(__FILE__, __LINE__);
+
+        if (!$db->num_rows($result))
+                message($lang_common['Bad request']);
+
+        $subject = $db->result($result);
+
-        $query = array(
-                'UPDATE'        => 'topics',
@@ -953 +1017 @@
-        $db->query_build($query) or error(__FILE__, __LINE__);
-
-$unstick
+array($unstick, sef_friendly($subject))
-}
-
@@ -1000 +1064 @@
-$pun_page['crumbs'] = array(
-        array($pun_config['o_board_title'], pun_link($pun_url['index'])),
-$fid
+array($fid, sef_friendly($cur_forum['forum_name']))
-        $lang_forum['Moderate forum']
-);
@@ -1097 +1161 @@
-                        }
-
-$cur_topic['id']
+array($cur_topic['id'], sef_friendly($cur_topic['subject']))
-
-                        $pun_page['item_pages'] = ceil(($cur_topic['num_replies'] + 1) / $pun_user['disp_posts']);

branches/punbb-1.3-dev/upload/post.php

@@ -336 +336 @@
-// Setup breadcrumbs
-$pun_page['crumbs'][] = array($pun_config['o_board_title'], pun_link($pun_url['index']));
-$cur_posting['id']
-$tid
+array($cur_posting['id'], sef_friendly($cur_posting['forum_name']))
+array($tid, sef_friendly($cur_posting['subject']))
-$pun_page['crumbs'][] = $tid ? $lang_post['Post reply'] : $lang_post['Post new topic'];
-