[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: forum/admin category.php,1.25,1.25.2.1 index.php
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: forum/admin category.php,1.25,1.25.2.1 index.php,1.31,1.31.2.1 |
|
Date: |
Sat, 19 Jan 2002 22:36:06 -0500 |
Update of /cvsroot/phpgroupware/forum/admin
In directory subversions:/tmp/cvs-serv9376/admin
Modified Files:
Tag: Version-0_9_14-branch
category.php index.php
Log Message:
.
Index: category.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/admin/category.php,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** category.php 5 Aug 2001 05:04:04 -0000 1.25
--- category.php 20 Jan 2002 03:36:03 -0000 1.25.2.1
***************
*** 13,68 ****
/* $Id$ */
! $phpgw_info["flags"]["currentapp"] = "forum";
! if($action)
{
! $phpgw_info["flags"]["noheader"] = True;
! $phpgw_info["flags"]["nonavbar"] = True;
}
! include("../../header.inc.php");
//setting up template file
! $phpgw->template->set_file('CATEGORY','admin.category.tpl');
! $phpgw->template->set_var(array(
! 'FORUM_ADMIN' => lang("Forums") . " " . lang("Admin"),
! 'TABLEBG' => $phpgw_info["theme"]["th_bg"],
! //TRY TO FIND A PERFECT CHOICE
! 'THBG' => $phpgw_info["theme"]["bg09"],
! //'TRBG' => $phpgw_info["theme"]["row_off"],
!
! 'CAT_LINK' => $phpgw->link("/forum/admin/category.php"),
! 'FOR_LINK' => $phpgw->link("/forum/admin/forum.php"),
! 'MAIN_LINK' => $phpgw->link("/forum/index.php"),
! 'ADM_LINK' => $phpgw->link("/forum/admin/index.php"),
! 'LANG_ADM_MAIN' => lang("Return to Admin"),
! 'LANG_CAT' => lang("New Category"),
! 'LANG_FOR' => lang("New Forum"),
! 'LANG_MAIN' => lang("Return to Forums"),
! 'LANG_FORUM' => lang("Forum Name"),
! 'LANG_FORUM_DESC' => lang("Forum Description"),
! 'LANG_CAT_NAME' => lang("Category Name"),
! 'LANG_CAT_DESC' => lang("Category Description"),
! 'BELONG_TO' => lang("Belongs to Category"),
! 'ACTION' => 'addforum',
! 'ACTION_LINK' => $phpgw->link("/forum/admin/category.php")
! ));
! if($act == "edit")
{
! $phpgw->db->query("select * from phpgw_forum_categories where
id=$cat_id");
! $phpgw->db->next_record();
! $catname = $phpgw->db->f("name");
! $catdescr = $phpgw->db->f("descr");
! $cat_id = $phpgw->db->f("id");
!
! $phpgw->template->set_var(array(
! 'BUTTONLANG' => lang("Update Category"),
! 'LANG_ADD_CAT' => lang("Edit Category"),
! 'CAT_NAME' => $phpgw->db->f("name"),
! 'CAT_DESC' => $phpgw->db->f("descr"),
! 'CAT_ID' => $phpgw->db->f("id"),
! 'ACTIONTYPE' => 'updcat'
! ));
}
--- 13,74 ----
/* $Id$ */
! $GLOBALS['phpgw_info']['flags'] = Array
! 'currentapp' => 'forum'
! );
! if($GLOBALS['HTTP_POST_VARS']['action'])
{
! $GLOBALS['phpgw_info']['flags']['noheader'] = True;
! $GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
}
! include('../../header.inc.php');
//setting up template file
! $GLOBALS['phpgw']->template->set_file('CATEGORY','admin.category.tpl');
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'FORUM_ADMIN' => lang('Forums') . ' ' . lang('Admin'),
! 'TABLEBG' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
! //TRY TO FIND A PERFECT CHOICE
! 'THBG' =>
$GLOBALS['phpgw_info']['theme']['bg09'],
! //'TRBG' =>
$GLOBALS['phpgw_info']['theme']['row_off'],
!
! 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/category.php'),
! 'FOR_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/forum.php'),
! 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/forum/index.php'),
! 'ADM_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/index.php'),
! 'LANG_ADM_MAIN' => lang('Return to Admin'),
! 'LANG_CAT' => lang('New Category'),
! 'LANG_FOR' => lang('New Forum'),
! 'LANG_MAIN' => lang('Return to Forums'),
! 'LANG_FORUM' => lang('Forum Name'),
! 'LANG_FORUM_DESC' => lang('Forum Description'),
! 'LANG_CAT_NAME' => lang('Category Name'),
! 'LANG_CAT_DESC' => lang('Category Description'),
! 'BELONG_TO' => lang('Belongs to Category'),
! 'ACTION' => 'addforum',
! 'ACTION_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/category.php')
! )
! );
! if($act == 'edit')
{
! $GLOBALS['phpgw']->db->query('select * from
phpgw_forum_categories where id='.$cat_id,__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $catname = $GLOBALS['phpgw']->db->f('name');
! $catdescr = $GLOBALS['phpgw']->db->f('descr');
! $cat_id = $GLOBALS['phpgw']->db->f('id');
!
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'BUTTONLANG' => lang('Update Category'),
! 'LANG_ADD_CAT' => lang('Edit Category'),
! 'CAT_NAME' =>
$GLOBALS['phpgw']->db->f('name'),
! 'CAT_DESC' =>
$GLOBALS['phpgw']->db->f('descr'),
! 'CAT_ID' =>
$GLOBALS['phpgw']->db->f('id'),
! 'ACTIONTYPE' => 'updcat'
! )
! );
}
***************
*** 71,79 ****
{
! $phpgw->template->set_var(array(
! 'BUTTONLANG' => lang("Add Category"),
! 'LANG_ADD_CAT' => lang("Edit Category"),
! 'ACTIONTYPE' => 'addcat'
! ));
}
--- 77,87 ----
{
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'BUTTONLANG' => lang('Add Category'),
! 'LANG_ADD_CAT' => lang('Edit Category'),
! 'ACTIONTYPE' => 'addcat'
! )
! );
}
***************
*** 81,110 ****
! if($action)
{
! if($action == "addcat")
{
! $phpgw->db->query("insert into phpgw_forum_categories
(name,descr) values ('$catname','$catdescr')");
! Header("Location: " .
$phpgw->link("/forum/admin/index.php"));
! $phpgw->common->phpgw_exit();
}
! elseif ($action == "updcat" && $cat_id)
{
! $phpgw->db->query("update phpgw_forum_categories set
name='$catname',descr='$catdescr' where id = $cat_id");
! Header("Location: " .
$phpgw->link("/forum/admin/index.php"));
}
else
{
! echo "This should not happened";
! Header("Location: " .
$phpgw->link("/forum/admin/index.php"));
}
! $phpgw->common->phpgw_exit();
!
!
} // end if($action)
! $phpgw->template->pfp('Out','CATEGORY');
! $phpgw->common->phpgw_footer();
?>
--- 89,115 ----
! if($GLOBALS['HTTP_POST_VARS']['action'])
{
! if($GLOBALS['HTTP_POST_VARS']['action'] == 'addcat')
{
! $GLOBALS['phpgw']->db->query("insert into
phpgw_forum_categories (name,descr) values
('".$catname."','".$catdescr."')",__LINE__,__FILE__);
! Header('Location: ' .
$GLOBALS['phpgw']->link('/forum/admin/index.php'));
}
! elseif ($action == 'updcat' && $cat_id)
{
! $GLOBALS['phpgw']->db->query("update
phpgw_forum_categories set name='".$catname."',descr='".$catdescr."' where id =
".$cat_id,__LINE__,__FILE__);
! Header('Location: ' .
$GLOBALS['phpgw']->link('/forum/admin/index.php'));
}
else
{
! echo 'This should not happened';
! Header("Location: " .
$GLOBALS['phpgw']->link('/forum/admin/index.php'));
}
! $GLOBALS['phpgw']->common->phpgw_exit();
} // end if($action)
! $GLOBALS['phpgw']->template->pfp('Out','CATEGORY');
! $GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/admin/index.php,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -r1.31 -r1.31.2.1
*** index.php 2 Oct 2001 21:33:29 -0000 1.31
--- index.php 20 Jan 2002 03:36:03 -0000 1.31.2.1
***************
*** 13,55 ****
/* $Id$ */
! $phpgw_info["flags"] = array("currentapp" => "forum",
"enable_nextmatchs_class" => True);
! include("../../header.inc.php");
! $phpgw->template->set_file('INDEX','admin.index.tpl');
//Set block for the category and forum
! $phpgw->template->set_block('INDEX','ForumBlock','ForumB');
! $phpgw->template->set_block('INDEX','CatBlock','CatB');
! $phpgw->template->set_var(array(
! 'FORUM_ADMIN' => lang("Forums") . " " . lang("Admin"),
! 'TB_BG' => $phpgw_info["theme"]["table_bg"],
! //TRY TO FIND A PERFECT CHOICE
! // $phpgw_info["theme"]["bg_color"]
! 'TR_BG' => $phpgw_info["theme"]["bg_color"],
! IMG_URL_PREFIX => PHPGW_IMAGES . "/",
! 'CAT_LINK' => $phpgw->link("/forum/admin/category.php"),
! 'FOR_LINK' => $phpgw->link("/forum/admin/forum.php"),
! 'MAIN_LINK' => $phpgw->link("/forum/index.php"),
! 'LANG_CAT' => lang("New Category"),
! 'LANG_FOR' => lang("New Forum"),
! 'LANG_MAIN' => lang("Return to Forums"),
! 'LANG_CURRENT_SUBFORUM' => lang("Current Categories and Sub
Forums"),
! 'LANG_CATEGORY' => lang("Category"),
! 'LANG_SUBCAT' => lang("Sub Category"),
! 'LANG_ACTION' => lang("Action")
! ));
$f_tree = array();
! $phpgw->db->query("select * from phpgw_forum_categories");
! while($phpgw->db->next_record())
{
! $f_tree[$phpgw->db->f("id")] =
array("name"=>$phpgw->db->f("name"), "descr"=>$phpgw->db->f("descr"),
"forums"=>array());
}
! $phpgw->db->query("select * from phpgw_forum_forums");
! while($phpgw->db->next_record())
{
! $f_tree[$phpgw->db->f("cat_id")]["forums"][$phpgw->db->f("id")]
= array("name"=>$phpgw->db->f("name"), "descr"=>$phpgw->db->f("descr"));
}
ksort($f_tree);
--- 13,68 ----
/* $Id$ */
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'forum',
! 'enable_nextmatchs_class' => True
! );
! include('../../header.inc.php');
! $GLOBALS['phpgw']->template->set_file('INDEX','admin.index.tpl');
//Set block for the category and forum
! $GLOBALS['phpgw']->template->set_block('INDEX','ForumBlock','ForumB');
! $GLOBALS['phpgw']->template->set_block('INDEX','CatBlock','CatB');
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'FORUM_ADMIN' => lang('Forums') . " " . lang('Admin'),
! 'TB_BG' => $GLOBALS['phpgw_info']['theme']['table_bg'],
! //TRY TO FIND A PERFECT CHOICE
! // $GLOBALS['phpgw_info']['theme']['bg_color']
! 'TR_BG' =>
$GLOBALS['phpgw_info']['theme']['bg_color'],
! 'CAT_IMG' =>
$GLOBALS['phpgw']->common->image('forum','category'),
! 'FORUM_IMG' =>
$GLOBALS['phpgw']->common->image('forum','forum'),
! 'CAT_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/category.php'),
! 'FOR_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/forum.php'),
! 'MAIN_LINK' =>
$GLOBALS['phpgw']->link('/forum/index.php'),
! 'LANG_CAT' => lang('New Category'),
! 'LANG_FOR' => lang('New Forum'),
! 'LANG_MAIN' => lang('Return to Forums'),
! 'LANG_CURRENT_SUBFORUM' => lang('Current Categories and
Sub Forums'),
! 'LANG_CATEGORY' => lang('Category'),
! 'LANG_SUBCAT' => lang('Sub Category'),
! 'LANG_ACTION' => lang('Action')
! )
! );
$f_tree = array();
! $GLOBALS['phpgw']->db->query('select * from phpgw_forum_categories');
! while($GLOBALS['phpgw']->db->next_record())
{
! $f_tree[$GLOBALS['phpgw']->db->f('id')] = Array(
! 'name' => $GLOBALS['phpgw']->db->f('name'),
! 'descr' => $GLOBALS['phpgw']->db->f('descr'),
! 'forums' => Array()
! );
}
! $GLOBALS['phpgw']->db->query('select * from phpgw_forum_forums');
! while($GLOBALS['phpgw']->db->next_record())
{
!
$f_tree[$GLOBALS['phpgw']->db->f('cat_id')]['forums'][$GLOBALS['phpgw']->db->f('id')]
= Array(
! 'name' => $GLOBALS['phpgw']->db->f('name'),
! 'descr' => $GLOBALS['phpgw']->db->f('descr')
! );
}
ksort($f_tree);
***************
*** 60,122 ****
if($id > 0)
{
!
!
! $phpgw->template->set_var(array(
! 'BG6' => $phpgw_info['theme']['bg03'],
! 'CAT_NAME' => $f_tree[$id]['name'],
! 'CAT_DESC' =>
($f_tree[$id]['descr']?$f_tree[$id]['descr']:' '),
! 'EDIT_LINK' =>
$phpgw->link('/forum/admin/category.php',"act=edit&cat_id=$id"),
! 'DEL_LINK' =>
$phpgw->link('/forum/admin/deletecategory.php',"cat_id=$id"),
! 'LANG_EDIT' => lang('Edit'),
! 'LANG_DEL' => lang('Delete')
! ));
!
!
}
else
{
// Not sure changing to what
! echo "<h1>running this?</h1>";
! echo "<tr>\n";
! echo " <td colspan=3 align=right valign=top>\n";
! echo "<table border=0 width=100%>\n";
}
! $tr_color = $phpgw_info["theme"]["row_off"];
//Cleaning the ForumB variable because the blocks use more than
once
! $phpgw->template->set_var('ForumB','');
! for(reset($f_tree[$id]["forums"]);
$fid=key($f_tree[$id]["forums"]); next($f_tree[$id]["forums"]))
{
! $tr_color =
$phpgw->nextmatchs->alternate_row_color($tr_color);
! $phpgw->template->set_var(array(
! 'TD_BG' => 'ffffff',
! 'TR_BG' => $tr_color,
! 'SUBCAT_NAME' =>
$f_tree[$id]['forums'][$fid]['name'],
! 'SUBCAT_DESC' =>
($f_tree[$id]['forums'][$fid]['descr']?$f_tree[$id]['forums'][$fid]['descr']:' '),
! 'SUBEDIT_LINK' =>
$phpgw->link('/forum/admin/forum.php',"act=edit&for_id=$fid"),
! 'SUBDEL_LINK' =>
$phpgw->link('/forum/admin/deleteforum.php', "for_id=$fid"),
! 'LANG_EDIT' => lang('Edit'),
! 'LANG_DEL' => lang('Delete'),
! 'LANG_FORUM' => lang('Forum')
! ));
//Parsing the inner block
! $phpgw->template->fp('ForumB','ForumBlock',true);
}
// Parsing the outer block
! $phpgw->template->set_var(array(
! 'TD_BG' => 'ffffff',
! 'TR_BG' => $tr_color
! ));
! $phpgw->template->fp('CatB','CatBlock',true);
}
! $phpgw->template->set_var('BG6',$phpgw_info['theme']['bg03']);
! $phpgw->template->set_var('TD_BG','ffffff');
! $phpgw->template->pfp('Out','INDEX');
! $phpgw->common->phpgw_footer();
! ?>
\ No newline at end of file
--- 73,137 ----
if($id > 0)
{
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'BG6' =>
$GLOBALS['phpgw_info']['theme']['bg03'],
! 'CAT_NAME' => $f_tree[$id]['name'],
! 'CAT_DESC' =>
($f_tree[$id]['descr']?$f_tree[$id]['descr']:' '),
! 'EDIT_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/category.php',"act=edit&cat_id=$id"),
! 'DEL_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/deletecategory.php',"cat_id=$id"),
! 'LANG_EDIT' => lang('Edit'),
! 'LANG_DEL' => lang('Delete')
! )
! );
}
else
{
// Not sure changing to what
! echo '<h1>running this?</h1>';
! echo '<tr>'."\n";
! echo ' <td colspan="3" align="right"
valign="top">'."\n";
! echo '<table border="0" width="100%">'."\n";
}
! $GLOBALS['tr_color'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
//Cleaning the ForumB variable because the blocks use more than
once
! $GLOBALS['phpgw']->template->set_var('ForumB','');
! for(reset($f_tree[$id]['forums']);
$fid=key($f_tree[$id]['forums']); next($f_tree[$id]['forums']))
{
! $GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color();
! $phpgw->template->set_var(
! Array(
! 'TD_BG' => 'ffffff',
! 'TR_BG' => $GLOBALS['tr_color'],
! 'SUBCAT_NAME' =>
$f_tree[$id]['forums'][$fid]['name'],
! 'SUBCAT_DESC' =>
($f_tree[$id]['forums'][$fid]['descr']?$f_tree[$id]['forums'][$fid]['descr']:' '),
! 'SUBEDIT_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/forum.php',"act=edit&for_id=$fid"),
! 'SUBDEL_LINK' =>
$GLOBALS['phpgw']->link('/forum/admin/deleteforum.php', "for_id=$fid"),
! 'LANG_EDIT' => lang('Edit'),
! 'LANG_DEL' => lang('Delete'),
! 'LANG_FORUM' => lang('Forum')
! )
! );
//Parsing the inner block
!
$GLOBALS['phpgw']->template->fp('ForumB','ForumBlock',true);
}
// Parsing the outer block
! $GLOBALS['phpgw']->template->set_var(
! Array(
! 'TD_BG' => 'ffffff',
! 'TR_BG' => $GLOBALS['tr_color']
! )
! );
! $GLOBALS['phpgw']->template->fp('CatB','CatBlock',true);
}
!
$GLOBALS['phpgw']->template->set_var('BG6',$GLOBALS['phpgw_info']['theme']['bg03']);
! $GLOBALS['phpgw']->template->set_var('TD_BG','ffffff');
! $GLOBALS['phpgw']->template->pfp('Out','INDEX');
! $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: forum/admin category.php,1.25,1.25.2.1 index.php,1.31,1.31.2.1,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: forum forums.php,1.22,1.22.2.1 index.php,1.25,1.25.2.1 read.php,1.31,1.31.2.1 threads.php,1.31,1.31.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: forum/setup phpgw_en.lang,1.5,1.6 setup.inc.php,1.17,1.18 tables_update.inc.php,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: forum forums.php,1.22,1.22.2.1 index.php,1.25,1.25.2.1 read.php,1.31,1.31.2.1 threads.php,1.31,1.31.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: forum/setup phpgw_en.lang,1.5,1.6 setup.inc.php,1.17,1.18 tables_update.inc.php,1.5,1.6
- Index(es):