Changeset 1554

Timestamp:

03/14/08 21:04:15 (2 months ago)

Author:

Neal

Message:

Fixed a bug where we redefined $pun_useris_admmod?, which caused some problems with moderator accounts.

Files:

• branches/punbb-1.3-dev/upload/delete.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/edit.php (modified) (7 diffs)
• branches/punbb-1.3-dev/upload/post.php (modified) (4 diffs)
• branches/punbb-1.3-dev/upload/viewforum.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/viewtopic.php (modified) (4 diffs)

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

@@ -72 +72 @@
-// Sort out who the moderators are and if we are currently a moderator (or an admin)
-$mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-user
+page
-
-$cur_post['is_topic'] = ($id == $cur_post['first_post_id']) ? true : false;
@@ -81 +81 @@
-        $cur_post['poster_id'] != $pun_user['id'] ||
-        $cur_post['closed'] == '1') &&
-user
+page
-        message($lang_common['No permission']);
-

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

@@ -72 +72 @@
-// Sort out who the moderators are and if we are currently a moderator (or an admin)
-$mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-user
+page
-
-// Do we have permission to edit this post?
@@ -78 +78 @@
-        $cur_post['poster_id'] != $pun_user['id'] ||
-        $cur_post['closed'] == '1') &&
-user
+page
-        message($lang_common['No permission']);
-
@@ -85 +85 @@
-$errors = array();
-
-user
+page
-
-if (isset($_POST['form_sent']))
@@ -100 +100 @@
-                else if (pun_strlen($subject) > 70)
-                        $errors[] = $lang_post['Too long subject'];
-user
+page
-                        $subject = ucwords(strtolower($subject));
-        }
@@ -111 +111 @@
-        else if (strlen($message) > PUN_MAX_POSTSIZE)
-                $errors[] = $lang_post['Too long message'];
-user
+page
-                $message = ucwords(strtolower($message));
-
@@ -159 +159 @@
-                );
-
-user
+page
-                        $query['SET'] .= ', edited='.time().', edited_by=\''.$db->escape($pun_user['username']).'\'';
-
@@ -313 +313 @@
-}
-
-user
+page
-{
-        if ((isset($_POST['form_sent']) && isset($_POST['silent'])) || !isset($_POST['form_sent']))

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

@@ -97 +97 @@
-// Sort out who the moderators are and if we are currently a moderator (or an admin)
-$mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
-user
+page
-
-// Do we have permission to post?
@@ -103 +103 @@
-        ($fid && (($cur_posting['post_topics'] == '' && $pun_user['g_post_topics'] == '0') || $cur_posting['post_topics'] == '0')) ||
-        (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
-user
+page
-        message($lang_common['No permission']);
-
@@ -132 +132 @@
-                else if (pun_strlen($subject) > 70)
-                        $errors[] = $lang_post['Too long subject'];
-user
+page
-                        $subject = ucwords(strtolower($subject));
-        }
@@ -173 +173 @@
-        else if (strlen($message) > PUN_MAX_POSTSIZE)
-                $errors[] = $lang_post['Too long message'];
-user
+page
-                $message = ucwords(strtolower($message));
-

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

@@ -76 +76 @@
-        $mods_array = unserialize($cur_forum['moderators']);
-
-user
+page
-
-// Sort out whether or not this user can post
-user
+page
-
-// Get topic/forum tracking data
@@ -160 +160 @@
-        $pun_page['main_foot_options'][] = '<a class="user-option" href="'.pun_link($pun_url['mark_forum_read'], $id).'"><span>'.$lang_forum['Mark forum read'].'</span></a>';
-
-user
+page
-                $pun_page['main_foot_options'][] = '<a class="mod-option" href="'.pun_sublink($pun_url['moderate_forum'], $pun_url['page'], $pun_page['page'], $id).'"><span>'.$lang_forum['Moderate forum'].'</span></a>';
-}

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

@@ -157 +157 @@
-// Sort out who the moderators are and if we are currently a moderator (or an admin)
-$mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
-user
+page
-
-// Can we or can we not post replies?
-user
-user
+page
+page
-else
-        $pun_user['may_post'] = false;
@@ -218 +218 @@
-
-$pun_page['main_foot_options'] = array();
-user
+page
-{
-        $pun_page['main_foot_options'][] = '<a class="mod-option" href="'.pun_link($pun_url['move'], array($cur_topic['forum_id'], $id)).'">'.$lang_topic['Move'].'</a>';
@@ -396 +396 @@
-                $pun_page['post_options'][] = '<a href="'.pun_link($pun_url['report'], $cur_post['id']).'"><span>'.$lang_topic['Report'].'<span>&#160;'.$lang_topic['Post'].' '.($pun_page['start_from'] + $pun_page['item_count']).'</span></span></a>';
-
-user
+page
-                {
-                        if ($cur_topic['closed'] == '0')
@@ -522 +522 @@
-        !$pun_user['is_guest'] &&
-        ($cur_topic['post_replies'] == '1' || ($cur_topic['post_replies'] == '' && $pun_user['g_post_replies'] == '1')) &&
-user
+page
-{
-