[Phpbbkb-checkins] SF.net SVN: phpbbkb: [55] main/trunk
Status: Alpha
Brought to you by:
markthedaemon
|
From: <so...@us...> - 2007-02-18 21:43:36
|
Revision: 55
http://svn.sourceforge.net/phpbbkb/?rev=55&view=rev
Author: softphp
Date: 2007-02-18 13:43:28 -0800 (Sun, 18 Feb 2007)
Log Message:
-----------
Fixed bugs #7, #1, #11, #10.
Modified Paths:
--------------
main/trunk/admin/admin_kb.php
main/trunk/kb/functions.php
main/trunk/kb.php
Modified: main/trunk/admin/admin_kb.php
===================================================================
--- main/trunk/admin/admin_kb.php 2007-02-15 04:18:49 UTC (rev 54)
+++ main/trunk/admin/admin_kb.php 2007-02-18 21:43:28 UTC (rev 55)
@@ -75,7 +75,7 @@
'body' => 'admin/kb_editcat.tpl')
);
- $parent = generate_cat_parents($cat['cat_main']);
+ $parent = generate_cat_parents($cat['cat_main'], $edit);
$s_hidden_fields = "<input type=\"hidden\" name=\"oldparent\" value=\"" . $cat['cat_main'] . "\">";
$template->assign_vars(array(
@@ -129,7 +129,7 @@
'body' => 'admin/kb_editcat.tpl')
);
- $parent = generate_cat_parents($cat['cat_main']);
+ $parent = generate_cat_parents($cat['cat_main'], $edit);
$s_hidden_fields = "<input type=\"hidden\" name=\"oldparent\" value=\"" . $cat['cat_main'] . "\">";
$template->set_filenames(array(
@@ -525,7 +525,7 @@
//////////////////
/// FUNCTIONS ///
//////////////////
-function generate_cat_parents($selected = false)
+function generate_cat_parents($selected = false, $current = false)
{
global $db, $lang;
@@ -555,19 +555,22 @@
for($i = 0; $i < count($cats); $i++)
{
- if(!$selected)
+ if(($current && $current != $cats[$i]['cat_id']) || (!$current))
{
- $parent .= '<option value="' . $cats[$i]['cat_id'] . '">' . $cats[$i]['cat_title'] . '</option>\n';
- }
- else
- {
- if($cats[$i]['cat_id'] == $selected)
+ if(!$selected)
{
- $parent .= '<option value="' . $cats[$i]['cat_id'] . '" selected="selected">' . $cats[$i]['cat_title'] . '</option>\n';
+ $parent .= '<option value="' . $cats[$i]['cat_id'] . '">' . $cats[$i]['cat_title'] . '</option>\n';
}
else
{
- $parent .= '<option value="' . $cats[$i]['cat_id'] . '">' . $cats[$i]['cat_title'] . '</option>\n';
+ if($cats[$i]['cat_id'] == $selected)
+ {
+ $parent .= '<option value="' . $cats[$i]['cat_id'] . '" selected="selected">' . $cats[$i]['cat_title'] . '</option>\n';
+ }
+ else
+ {
+ $parent .= '<option value="' . $cats[$i]['cat_id'] . '">' . $cats[$i]['cat_title'] . '</option>\n';
+ }
}
}
}
Modified: main/trunk/kb/functions.php
===================================================================
--- main/trunk/kb/functions.php 2007-02-15 04:18:49 UTC (rev 54)
+++ main/trunk/kb/functions.php 2007-02-18 21:43:28 UTC (rev 55)
@@ -300,7 +300,7 @@
$message = ( !empty($HTTP_POST_VARS['message']) ) ? $HTTP_POST_VARS['message'] : '';
$article_author = ($mode == 'edit') ? $article['article_author'] : $userdata['user_id'];
$article_authorname = ( $mode == 'edit' ) ? ( ( empty($HTTP_POST_VARS['authorname']) ) ? $article['article_authorname'] : $HTTP_POST_VARS['authorname'] ) : ( ( empty($HTTP_POST_VARS['authorname']) ) ? $userdata['username'] : $HTTP_POST_VARS['authorname'] );
- $bbcode_uid = '';
+ $bbcode_uid = ($mode == 'edit' ) ? $article['bbcode_uid'] : '';
$cat_id = $HTTP_POST_VARS['cats'];
$attach_sig = ( !empty($HTTP_POST_VARS['attach_sig']) ) ? 1 : 0;
@@ -358,6 +358,7 @@
article_edittime = '$current_time',
article_editby = '" . $userdata['user_id'] . "',
article_status = '$article_status',
+ bbcode_uid = '$bbcode_uid',
enable_sig = '$attach_sig',
enable_html = '$html_on',
enable_bbcode = '$bbcode_on',
@@ -799,7 +800,7 @@
// Delete an article
function ucp_article_delete($id, $confirm)
{
- global $lang, $db, $phpEx, $template;
+ global $lang, $db, $phpEx, $template, $HTTP_POST_VARS;
// Simple auth for alpha 1
if(($userdata['user_level'] != ADMIN) && ($userdata['user_id'] != $article['article_author']))
@@ -826,16 +827,16 @@
'L_YES' => $lang['Yes'],
'L_NO' => $lang['No'],
- 'S_CONFIRM_ACTION' => append_sid("kb." . $phpEx . "?mode=ucp&action=delete_article"),
+ 'S_CONFIRM_ACTION' => append_sid("kb." . $phpEx . "?pid=ucp&action=delete_article"),
'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
$template->pparse('confirm_body');
}
- elseif($confirm) // Double check they actually confirmed
+ else
{
$article_id = $HTTP_POST_VARS['article_id'];
-
+ echo $article_id;
// Need lang vars for the error messages?
$sql = "DELETE FROM " . KB_ARTICLES_TABLE . " WHERE article_id = '" . $article_id . "'";
if(!$db->sql_query($sql))
@@ -850,13 +851,8 @@
}
// Message
- $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&id=' . $article_id) . '>"';
- $return_message = $lang['kb_deleted'] . '<br /><br />' . sprintf($lang['kb_click_view_article'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=view_article&cid=' . $cat . '&id=' . $article_id) . '">', '</a>') . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>');
-
- $template->assign_vars(array(
- 'META' => $meta)
- );
-
+ $return_message = $lang['kb_deleted'] . '<br /><br />' . sprintf($lang['kb_click_return_ucp'], '<a href="' . append_sid('kb.' . $phpEx . '?pid=ucp') . '">', '</a>');
+
message_die(GENERAL_MESSAGE, $return_message);
}
}
Modified: main/trunk/kb.php
===================================================================
--- main/trunk/kb.php 2007-02-15 04:18:49 UTC (rev 54)
+++ main/trunk/kb.php 2007-02-18 21:43:28 UTC (rev 55)
@@ -281,6 +281,7 @@
'L_SUBCATS' => sprintf($lang['kb_viewcat_subcats'], $cat['cat_title']),
'L_LAST_ACTION' => $lang['kb_last_action'],
'L_ADD_ARTICLE' => $lang['kb_ucp_articlepost'],
+ 'ADD_ARTICLE_IMG' => $images['kb_new_article'],
'U_ADD_ARTICLE' => append_sid("kb.$phpEx?pid=ucp&action=post_article"))
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|