[Phpgroupware-cvs] phpbrain/inc/class.uikb.inc.php, 1.17.2.1

[nomail]

Update of /phpbrain/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.uikb.inc.php

date: 2004/05/21 02:18:19;  author: skwashd;  state: Exp;  lines: +18 -29

Log Message:
fix bug in support #103083, bug #8966 & update headers
=====================================================================
Index: phpbrain/inc/class.uikb.inc.php
diff -u phpbrain/inc/class.uikb.inc.php:1.17 
phpbrain/inc/class.uikb.inc.php:1.17.2.1
--- phpbrain/inc/class.uikb.inc.php:1.17        Sun Sep  7 04:09:54 2003
+++ phpbrain/inc/class.uikb.inc.php     Fri May 21 02:18:19 2004
@@ -9,8 +9,6 @@
  * Originally Written by Dave Hall - <skwashd at phpgroupware.org>     *
  * Loosely Based on phpBrain from Bart Veldhuizen - http://vrotvrot.com *
  * --------------------------------------------                                
*
- *  Development Sponsored by Creativix                                 *
- * --------------------------------------------                                
*
  * This program is Free Software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
  * the Free Software Foundation; either version 2 of the License, or   *
@@ -50,14 +48,13 @@
                        $this->bo       = createObject('phpbrain.bokb');
                        $this->cats     = CreateObject('phpgwapi.categories');
                        $this->theme    = $GLOBALS['phpgw_info']['theme'];
-                       $this->t        = $GLOBALS['phpgw']->template;
+                       $this->t        = &$GLOBALS['phpgw']->template;
                        $this->t->unknowns = 'remove';
                }
                
                function index()
                {
                        $this->browse();
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }
 
                function add()
@@ -68,7 +65,6 @@
                                $this->edit_vals['question_id'] = 
trim($_GET['question_id']);
                        }//end if question
                        $this->edit_answer(True);
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }//end add
 
                function add_comment()
@@ -98,8 +94,6 @@
                        }
                        
                        header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link)); 
-                       $GLOBALS['phpgw']->common->phpgw_exit();
-               
                }//end add comment      
                
                function add_question()
@@ -120,8 +114,6 @@
                                $msg = 'not added - error';
                        }// if ok
                        $this->unanswered($msg);
-                       $GLOBALS['phpgw']->common->phpgw_exit();
-                        
                }//end add question
 
                function browse()
@@ -143,12 +135,15 @@
                        {
                                $cat_name = $this->cats->id2name($cat_id);
                                $this->t->set_var('cur_category_name', 
$cat_name);
-                               $this->t->set_var('up_category_url', 
$GLOBALS['phpgw']->link('/index.php',
-                                                                               
        array('menuaction' => 'phpbrain.uikb.browse',
-                                                                               
                'cat_id'        => $this->cats->id2name($cat_id,'parent')
-                                                                               
                )
-                                                                               
        )
-                                               );
+                               
+                               $this->t->set_var('up_category_url', 
+                                       $GLOBALS['phpgw']->link('/index.php',
+                                               array('menuaction'      => 
'phpbrain.uikb.browse',
+                                                       'cat_id'        => 
$this->cats->id2name($cat_id,'parent')
+                                               )
+                                       )
+                               );
+                               
                                $this->t->set_var('lang_up', lang('up'));
                                $this->t->parse('ccname', 'cur_cat_name');
                        }
@@ -230,9 +225,9 @@
                                        $this->t->parse('cells', 'cell', true);
                                        $this->t->parse('row', 'cells');//, 
true);
                                        $this->t->parse('rows', 'cat_row', 
true);
-                               }//end if is_even(cells)
+                       }//end if is_even(cells)
 
-                               $this->t->parse('tbl','table');
+                       $this->t->parse('tbl','table');
                        }
                        else //!is_array(cats)
                        {
@@ -308,7 +303,6 @@
                        $faq_id = (int) (isset($_GET['faq_id']) ? 
trim($_GET['faq_id']) : 0);
                        $this->edit_vals = $this->bo->get_item($faq_id, false);
                        $this->edit_answer(False);
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }//end edit
                
                function edit_answer($new)
@@ -372,7 +366,6 @@
                        echo parse_navbar();
                        echo '<h2>Coming Soon!</h2>';
                        echo 'This will link to the manual for this app when 
completed';
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }//end help
                
                function maint_answer()
@@ -383,7 +376,6 @@
                        echo parse_navbar();
                                echo '<h2 align="center">Coming Soon!</h2>';
                                echo 'A proper manual will be added soon';
-                               $GLOBALS['phpgw']->common->exit();
                        }
                        else//must be admin
                        {
@@ -463,14 +455,15 @@
                                }
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
-                       $this->t->set_file('admin_maint', 'admin_maint.tpl');
+                       
+                       $this->t->set_file('admin_maint', 'admin_maint.tpl');
                        $this->t->set_block('admin_maint', 'pending_list', 
'pending_items');
                        $this->t->set_block('admin_maint', 'pending_block', 
'p_block');
                        $this->t->set_var('admin_url', 
$GLOBALS['phpgw']->link('/admin/index.php'));
                        $this->t->set_var('lang_return_to_admin', 
lang('return_to_admin'));
-                               $this->t->set_var('msg', ((strlen($msg) !=0) ? 
$msg : '&nbsp;'));
-
-                               $questions = $this->bo->get_questions(true);    
                        
+                       $this->t->set_var('msg', ((strlen($msg) !=0) ? $msg : 
'&nbsp;'));
+                       
+                       $questions = $this->bo->get_questions(true);            
                
                        if(is_array($questions))
                        {
                                foreach($questions as $key => $val)
@@ -503,7 +496,6 @@
                function preview()
                {
                        $this->view(false);
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }
 
                function rate()
@@ -515,7 +507,6 @@
                                $this->bo->set_rating($faq_id, $rating);
                        }
                        $this->view();
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                }//end rate
                
                function save()
@@ -539,7 +530,6 @@
                                                                                
)
                                                                        )
                                        );
-                       $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        else
                        {
@@ -579,7 +569,6 @@
                        else
                        {
                                $this->browse();
-                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                }//end search