diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-09-24 19:41:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-09-24 19:41:14 +0000 |
| commit | 8675e30366dbe0e9baf35a3398019da500198549 (patch) | |
| tree | ace084d93e82cbafdcc2f1ac45f6961a79f46e22 /phpBB/posting.php | |
| parent | f614337627ac7b6553cf3c6cdb50a3d9d9fe33a3 (diff) | |
| download | forums-8675e30366dbe0e9baf35a3398019da500198549.tar forums-8675e30366dbe0e9baf35a3398019da500198549.tar.gz forums-8675e30366dbe0e9baf35a3398019da500198549.tar.bz2 forums-8675e30366dbe0e9baf35a3398019da500198549.tar.xz forums-8675e30366dbe0e9baf35a3398019da500198549.zip | |
some small fixes
got rid of iframe (topic review)... tested new div method with various browsers, further testing and oppinions would be nice. ;)
NOTE: New css element added to theme
git-svn-id: file:///svn/phpbb/trunk@4510 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 51 |
1 files changed, 11 insertions, 40 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index f5c32ea32f..5eeae10773 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -56,7 +56,7 @@ if ($cancel || time() - $lastclick < 2) redirect($redirect); } -if (in_array($mode, array('post', 'reply', 'quote', 'edit', 'delete', 'topicreview')) && !$forum_id) +if (in_array($mode, array('post', 'reply', 'quote', 'edit', 'delete')) && !$forum_id) { trigger_error($user->lang['NO_FORUM']); } @@ -101,15 +101,6 @@ switch ($mode) OR f.forum_id = $forum_id)"; break; - case 'topicreview': - if (!$topic_id) - { - trigger_error($user->lang['NO_TOPIC']); - } - - topic_review($topic_id, $forum_id, FALSE); - break; - case 'smilies': generate_smilies('window'); break; @@ -370,8 +361,10 @@ if ($mode == 'delete') $html_status = ($config['allow_html'] && $auth->acl_get('f_html', $forum_id)) ? TRUE : FALSE; $bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)) ? TRUE : FALSE; $smilies_status = ($config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? TRUE : FALSE; -$img_status = ($config['allow_img'] && $auth->acl_get('f_img', $forum_id)) ? TRUE : FALSE; -$flash_status = ($config['allow_flash'] && $auth->acl_get('f_flash', $forum_id)) ? TRUE : FALSE; +//$img_status = ($config['allow_img'] && $auth->acl_get('f_img', $forum_id)) ? TRUE : FALSE; +$img_status = ($auth->acl_get('f_img', $forum_id)) ? TRUE : FALSE; +//$flash_status = ($config['allow_flash'] && $auth->acl_get('f_flash', $forum_id)) ? TRUE : FALSE; +$flash_status = ($auth->acl_get('f_flash', $forum_id)) ? TRUE : FALSE; // Save Draft @@ -981,7 +974,6 @@ $template->assign_vars(array( 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&f=" . $forum_id, 'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&$forum_id&t=$topic_id" : '', - 'U_REVIEW_TOPIC' => ($mode != 'post') ? "posting.$phpEx$SID&mode=topicreview&f=$forum_id&t=$topic_id" : '', 'S_DISPLAY_PREVIEW' => ($preview && !sizeof($error)), 'S_EDIT_POST' => ($mode == 'edit'), @@ -1096,7 +1088,7 @@ make_jumpbox('viewforum.'.$phpEx); // Topic review if ($mode == 'reply' || $mode == 'quote') { - topic_review($topic_id, $forum_id, TRUE); + topic_review($topic_id, $forum_id); } page_footer(); @@ -1367,22 +1359,10 @@ function user_notification($mode, $subject, $forum_id, $topic_id, $post_id) } } - // Topic Review -function topic_review($topic_id, $forum_id, $is_inline_review = FALSE) +function topic_review($topic_id, $forum_id) { - global $template; - - if ($is_inline_review) - { - $template->assign_vars(array( - 'S_DISPLAY_INLINE' => TRUE) - ); - - return; - } - - global $user, $auth, $db, $template, $bbcode; + global $user, $auth, $db, $template, $bbcode, $template; global $censors, $config, $phpbb_root_path, $phpEx, $SID; // Define censored word matches @@ -1491,19 +1471,10 @@ function topic_review($topic_id, $forum_id, $is_inline_review = FALSE) unset($rowset[$i]); } - // $template->assign_var('QUOTE_IMG', $user->img('btn_quote', $user->lang['QUOTE_POST'])); - - // - page_header($page_title); - - $template->set_filenames(array( - 'body' => 'posting_topic_review.html') - ); - - page_footer(); } + // Temp Function - strtolower - borrowed from php.net function phpbb_strtolower($string) { @@ -2042,7 +2013,7 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_ $db->sql_query($sql); } } -/* + if (count($attach_data)) { $sql = 'UPDATE ' . POSTS_TABLE . ' @@ -2055,7 +2026,7 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_ WHERE topic_id = ' . $data['topic_id']; $db->sql_query($sql); } -*/ + } $db->sql_transaction('commit'); |