[Phpgroupware-cvs] CVS: polls admin.php,1.16,1.17 admin_addanswer.php,1.14,1.15 admin_editquestion.php,1.8,1.9 admin_settings.php,1.10,1.11 admin_viewquestion.php,1.9,1.10

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/polls
In directory subversions:/tmp/cvs-serv27690

Modified Files:
        admin.php admin_addanswer.php admin_editquestion.php 
        admin_settings.php admin_viewquestion.php 
Log Message:
patch #641

Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** admin.php   15 Nov 2002 09:07:42 -0000      1.16
--- admin.php   15 Nov 2002 09:39:40 -0000      1.17
***************
*** 21,27 ****
        include('../header.inc.php');
  
!       $show  = get_var('show',Array('GET'));
!       $order = get_var('order',Array('GET'));
!       $sort  = get_var('sort',Array('GET'));
  
        if(!$show)
--- 21,27 ----
        include('../header.inc.php');
  
!       $show  = get_var('show',Array('GET'));
!       $order = get_var('order',Array('GET'));
!       $sort  = get_var('sort',Array('GET'));
  
        if(!$show)

Index: admin_addanswer.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_addanswer.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** admin_addanswer.php 15 Nov 2002 09:07:42 -0000      1.14
--- admin_addanswer.php 15 Nov 2002 09:39:41 -0000      1.15
***************
*** 25,33 ****
        $GLOBALS['phpgw']->template->set_block('admin','row','row');
  
!       if(get_var('submit',Array('POST')))
        {
!               $poll_id = get_var('poll_Id',Array('POST'));
!               $answer  = get_var('answer',Array('POST'));
!               $vote_id = get_var('vote_Id',Array('POST'));
  
                $GLOBALS['phpgw']->db->query("select max(vote_id)+1 from 
phpgw_polls_data where poll_id='$poll_id'",__LINE__,__FILE__);
--- 25,33 ----
        $GLOBALS['phpgw']->template->set_block('admin','row','row');
  
!       if ($HTTP_POST_VARS['submit'])
        {
!               $poll_id = $HTTP_POST_VARS['poll_id'];
!               $answer  = $HTTP_POST_VARS['answer'];
!               $vote_id = $HTTP_POST_VARS['vote_id'];
  
                $GLOBALS['phpgw']->db->query("select max(vote_id)+1 from 
phpgw_polls_data where poll_id='$poll_id'",__LINE__,__FILE__);

Index: admin_editquestion.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_editquestion.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_editquestion.php      15 Nov 2002 09:07:42 -0000      1.8
--- admin_editquestion.php      15 Nov 2002 09:39:41 -0000      1.9
***************
*** 25,33 ****
        $GLOBALS['phpgw']->template->set_block('admin','row','row');
  
!       $poll_id = get_var('poll_id',Array('POST','GET'));
  
!       if(get_var('edit',Array('POST')))
        {
!               $question = get_var('question',Array('POST'));
                $GLOBALS['phpgw']->db->query("update phpgw_polls_desc set 
poll_title='" . addslashes($question)
                        . "' where poll_id='$poll_id'",__LINE__,__FILE__);
--- 25,33 ----
        $GLOBALS['phpgw']->template->set_block('admin','row','row');
  
!       $poll_id = $HTTP_GET_VARS['poll_id'] ? $HTTP_GET_VARS['poll_id'] : 
$HTTP_POST_VARS['poll_id'];
  
!       if ($HTTP_POST_VARS['edit'])
        {
!               $question = $HTTP_POST_VARS['question'];
                $GLOBALS['phpgw']->db->query("update phpgw_polls_desc set 
poll_title='" . addslashes($question)
                        . "' where poll_id='$poll_id'",__LINE__,__FILE__);

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_settings.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** admin_settings.php  15 Nov 2002 09:07:42 -0000      1.10
--- admin_settings.php  15 Nov 2002 09:39:41 -0000      1.11
***************
*** 21,27 ****
        include('../header.inc.php');
  
!       if(get_var('submit',Array('POST')))
        {
!               $settings = get_var('settings',Array('POST'));
                $GLOBALS['phpgw']->db->query('delete from 
phpgw_polls_settings',__LINE__,__FILE__);
  
--- 21,27 ----
        include('../header.inc.php');
  
!       if ($HTTP_POST_VARS['submit'])
        {
!               $settings = $HTTP_POST_VARS['settings'];
                $GLOBALS['phpgw']->db->query('delete from 
phpgw_polls_settings',__LINE__,__FILE__);
  

Index: admin_viewquestion.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_viewquestion.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_viewquestion.php      15 Nov 2002 09:07:42 -0000      1.9
--- admin_viewquestion.php      15 Nov 2002 09:39:41 -0000      1.10
***************
*** 21,25 ****
        include('../header.inc.php');
  
!       $poll_id = get_var('poll_id',Array('GET'));
  
        $GLOBALS['phpgw']->template->set_file(array('admin' => 
'admin_form.tpl'));
--- 21,25 ----
        include('../header.inc.php');
  
!       $poll_id = $HTTP_GET_VARS['poll_id'];
  
        $GLOBALS['phpgw']->template->set_file(array('admin' => 
'admin_form.tpl'));