phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.7,1.8 class.ui


From: Mark A Peters <address@hidden>
Subject: [Phpgroupware-cvs] CVS: forum/inc class.boforum.inc.php,1.7,1.8 class.uiadmin.inc.php,1.3,1.4 class.uiforum.inc.php,1.8,1.9 functions.inc.php,1.15,1.16
Date: Tue, 30 Apr 2002 14:05:01 -0400

Update of /cvsroot/phpgroupware/forum/inc
In directory subversions:/tmp/cvs-serv25694/inc

Modified Files:
        class.boforum.inc.php class.uiadmin.inc.php 
        class.uiforum.inc.php functions.inc.php 
Log Message:
Converting to get_var() for all HTTP_*_VARS.

Index: class.boforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.boforum.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.boforum.inc.php       20 Mar 2002 12:37:42 -0000      1.7
--- class.boforum.inc.php       30 Apr 2002 18:04:59 -0000      1.8
***************
*** 56,63 ****
                        {
                                $var_str = $var[$i];
! //                            $this->$var_str = 
(@isset($GLOBALS['HTTP_GET_VARS'][$var_str])?intval($GLOBALS['HTTP_GET_VARS'][$var_str]):$this->$var_str);
! //                            $this->$var_str = 
(@isset($GLOBALS['HTTP_POST_VARS'][$var_str])?intval($GLOBALS['HTTP_POST_VARS'][$var_str]):$this->$var_str);
!                               $this->$var_str = 
(@isset($GLOBALS['HTTP_GET_VARS'][$var_str])?$GLOBALS['HTTP_GET_VARS'][$var_str]:$this->$var_str);
!                               $this->$var_str = 
(@isset($GLOBALS['HTTP_POST_VARS'][$var_str])?$GLOBALS['HTTP_POST_VARS'][$var_str]:$this->$var_str);
                        }
                        if(address@hidden($this->view))
--- 56,61 ----
                        {
                                $var_str = $var[$i];
! //                            $this->$var_str = 
intval(get_var($var_str,'Array('DEFAULT','GET','POST'),$this->$var_str));
!                               $this->$var_str = 
get_var($var_str,'Array('DEFAULT','GET','POST'),$this->$var_str);
                        }
                        if(address@hidden($this->view))
***************
*** 89,100 ****
                function post()
                {
!                       if ($GLOBALS['HTTP_POST_VARS']['action'] == 'post')
                        {
                                $data = Array(
!                                       'cat_id'   => 
$GLOBALS['HTTP_POST_VARS']['cat_id'],
!                                       'forum_id' => 
$GLOBALS['HTTP_POST_VARS']['forum_id'],
                                        'postdate' => time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])),
!                                       'subject'  => 
$GLOBALS['HTTP_POST_VARS']['subject'],
!                                       'message'  => 
$GLOBALS['HTTP_POST_VARS']['message']
                                );
  
--- 87,98 ----
                function post()
                {
!                       if (get_var('action',Array('POST')) == 'post')
                        {
                                $data = Array(
!                                       'cat_id'   => 
get_var('cat_id',Array('POST')),
!                                       'forum_id' => 
get_var('forum_id',Array('POST')),
                                        'postdate' => time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])),
!                                       'subject'  => 
get_var('subject',Array('POST')),
!                                       'message'  => 
get_var('message',Array('POST'))
                                );
  
***************
*** 107,111 ****
                function reply()
                {
!                       if ($GLOBALS['HTTP_POST_VARS']['action'] == 'reply')
                        {
                                $stat = 0;
--- 105,109 ----
                function reply()
                {
!                       if (get_var('action',Array('POST')) == 'reply')
                        {
                                $stat = 0;
***************
*** 115,137 ****
                                $next_f_threads_id = 
$this->so->get_max_thread_id() + 1;
  
!                               if ($GLOBALS['HTTP_POST_VARS']['pos'] != 0)
                                {
!                                       
$this->so->fix_pos($GLOBALS['HTTP_POST_VARS']['thread'],$GLOBALS['HTTP_POST_VARS']['pos']);
                                }
                                else
                                {
!                                       $GLOBALS['HTTP_POST_VARS']['pos'] = 1;
                                }
  
                                $data = Array(
!                                       'pos' => 
$GLOBALS['HTTP_POST_VARS']['pos'],
!                                       'thread'   => 
$GLOBALS['HTTP_POST_VARS']['thread'],
!                                       'depth'    => 
$GLOBALS['HTTP_POST_VARS']['depth'],
                                        'postdate' => time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])),
!                                       'parent'   => 
$GLOBALS['HTTP_POST_VARS']['msg'],
!                                       'cat_id'   => 
$GLOBALS['HTTP_POST_VARS']['cat_id'],
!                                       'forum_id' => 
$GLOBALS['HTTP_POST_VARS']['forum_id'],
!                                       'subject'  => 
$GLOBALS['HTTP_POST_VARS']['subject'],
!                                       'message'  => 
$GLOBALS['HTTP_POST_VARS']['message']
                                );
  
--- 113,137 ----
                                $next_f_threads_id = 
$this->so->get_max_thread_id() + 1;
  
!                               $pos = get_var('pos',Array('POST'));
!                               $thread = get_var('thread',Array('POST'));
!                               if($pos != 0)
                                {
!                                       $this->so->fix_pos($thread,$pos);
                                }
                                else
                                {
!                                       $pos = 1;
                                }
  
                                $data = Array(
!                                       'pos' => $pos,
!                                       'thread'   => $thread,
!                                       'depth'    => 
get_var('depth',Array('POST')),
                                        'postdate' => time() - ((60 * 60) * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])),
!                                       'parent'   => 
get_var('msg',Array('POST')),
!                                       'cat_id'   => 
get_var('cat_id',Array('POST')),
!                                       'forum_id' => 
get_var('forum_id',Array('POST')),
!                                       'subject'  => 
get_var('subject',Array('POST')),
!                                       'message'  => 
get_var('message',Array('POST'))
                                );
  
***************
*** 173,177 ****
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       
$this->so->save_category($GLOBALS['HTTP_POST_VARS']['cat']);
                        Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
                        $GLOBALS['phpgw']->common->phpgw_exit();
--- 173,177 ----
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       $this->so->save_category(get_var('cat',Array('POST')));
                        Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
                        $GLOBALS['phpgw']->common->phpgw_exit();
***************
*** 185,189 ****
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       
$this->so->save_forum($GLOBALS['HTTP_POST_VARS']['forum']);
                        Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
                        $GLOBALS['phpgw']->common->phpgw_exit();
--- 185,189 ----
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
!                       $this->so->save_forum(get_var('forum',Array('POST')));
                        Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index'));
                        $GLOBALS['phpgw']->common->phpgw_exit();

Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiadmin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uiadmin.inc.php       17 Apr 2002 01:23:55 -0000      1.3
--- class.uiadmin.inc.php       30 Apr 2002 18:04:59 -0000      1.4
***************
*** 48,52 ****
                        $this->template_dir = 
$GLOBALS['phpgw']->common->get_tpl_dir('forum');
                        $this->template = 
CreateObject('phpgwapi.Template',$this->template_dir);
!                       $info = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
                        $this->current_page = $info[2];
                }
--- 48,52 ----
                        $this->template_dir = 
$GLOBALS['phpgw']->common->get_tpl_dir('forum');
                        $this->template = 
CreateObject('phpgwapi.Template',$this->template_dir);
!                       $info = explode('.',MENUACTION);
                        $this->current_page = $info[2];
                }
***************
*** 186,195 ****
                function edit_category()
                {
!                       
$this->category_screen($GLOBALS['HTTP_GET_VARS']['cat_id']);
                }
  
                function edit_forum()
                {
!                       
$this->forum_screen($GLOBALS['HTTP_GET_VARS']['forum_id']);
                }
  
--- 186,195 ----
                function edit_category()
                {
!                       $this->category_screen(get_var('cat_id',Array('GET')));
                }
  
                function edit_forum()
                {
!                       $this->forum_screen(get_var('forum_id',Array('GET')));
                }
  
***************
*** 232,236 ****
                                                Array(
                                                        'menuaction'    => 
'forum.boforum.delete_category',
!                                                       'cat_id'        => 
$GLOBALS['HTTP_GET_VARS']['cat_id']
                                                )
                                        ),
--- 232,236 ----
                                                Array(
                                                        'menuaction'    => 
'forum.boforum.delete_category',
!                                                       'cat_id'        => 
get_var('cat_id',Array('GET'))
                                                )
                                        ),
***************
*** 283,288 ****
                                                Array(
                                                        'menuaction'    => 
'forum.boforum.delete_forum',
!                                                       'cat_id'        => 
$GLOBALS['HTTP_GET_VARS']['cat_id'],
!                                                       'forum_id'      => 
$GLOBALS['HTTP_GET_VARS']['forum_id']
                                                )
                                        ),
--- 283,288 ----
                                                Array(
                                                        'menuaction'    => 
'forum.boforum.delete_forum',
!                                                       'cat_id'        => 
get_var('cat_id',Array('GET')),
!                                                       'forum_id'      => 
get_var('forum_id',Array('GET'))
                                                )
                                        ),

Index: class.uiforum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/class.uiforum.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uiforum.inc.php       21 Apr 2002 18:47:04 -0000      1.8
--- class.uiforum.inc.php       30 Apr 2002 18:04:59 -0000      1.9
***************
*** 336,341 ****
                        
$this->template->set_block('READ','msg_template','msg_template');
  
!                       $msg = $GLOBALS['HTTP_GET_VARS']['msg'];
!                       $pos = $GLOBALS['HTTP_GET_VARS']['pos'];
  
                        
$this->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
--- 336,341 ----
                        
$this->template->set_block('READ','msg_template','msg_template');
  
!                       $msg = get_var('msg',Array('GET'));
!                       $pos = get_var('pos',Array('GET'));
  
                        
$this->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
***************
*** 484,488 ****
                                'CAT_ID'        => $this->bo->cat_id,
                                'FORUM_ID'      => $this->bo->forum_id,
!                               'TYPE'          => 
$GLOBALS['HTTP_GET_VARS']['type'],
                                'ACTION'        => 'post',
                                'LANG_DATE'     => lang('Date'),
--- 484,488 ----
                                'CAT_ID'        => $this->bo->cat_id,
                                'FORUM_ID'      => $this->bo->forum_id,
!                               'TYPE'          => get_var('type',Array('GET')),
                                'ACTION'        => 'post',
                                'LANG_DATE'     => lang('Date'),

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/functions.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** functions.inc.php   20 Mar 2002 12:37:42 -0000      1.15
--- functions.inc.php   30 Apr 2002 18:04:59 -0000      1.16
***************
*** 16,21 ****
        $GLOBALS['session_info'] = 
$GLOBALS['phpgw']->session->appsession('session_data','forum');
  
!       $GLOBALS['cat_id'] = 
(@$GLOBALS['HTTP_GET_VARS']['cat_id'address@hidden'HTTP_GET_VARS']['cat_id']:$GLOBALS['session_info']['cat_id']);
!       $GLOBALS['forum_id'] = 
(@$GLOBALS['HTTP_GET_VARS']['forum_id'address@hidden'HTTP_GET_VARS']['forum_id']:$GLOBALS['session_info']['forum_id']);
  
        if (!is_array($GLOBALS['session_info']))
--- 16,21 ----
        $GLOBALS['session_info'] = 
$GLOBALS['phpgw']->session->appsession('session_data','forum');
  
!       $GLOBALS['cat_id'] = 
get_var('cat_id',Array('DEFAULT','GET'),$GLOBALS['session_info']['cat_id']);
!       $GLOBALS['forum_id'] = 
get_var('forum_id',Array('DEFAULT','GET'),$GLOBALS['session_info']['forum_id']);
  
        if (!is_array($GLOBALS['session_info']))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]