[Phpgroupware-cvs] CVS: polls admin.php,1.16.2.2,1.16.2.3 admin_deleteanswer.php,1.6,1.6.2.1

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        admin.php admin_deleteanswer.php 
Log Message:
found another little glitch - fixed it too


Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin.php,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C2 -r1.16.2.2 -r1.16.2.3
*** admin.php   23 Nov 2002 01:24:09 -0000      1.16.2.2
--- admin.php   23 Nov 2002 01:32:11 -0000      1.16.2.3
***************
*** 92,96 ****
                                                                                
                                                                          
'poll_id' => $GLOBALS['phpgw']->db->f('poll_id')
                                                                                
                                                                          ) ) 
.'">' . lang('Edit') . '</a>');
!                       $GLOBALS['phpgw']->template->set_var('row_delete','<a 
href="' . $GLOBALS['phpgw']->link('/polls/admin_deleteanswer.php','vote_id=' . 
$GLOBALS['phpgw']->db->f('vote_id')) . '">' . lang('Delete') . '</a>');
                }
                $GLOBALS['phpgw']->template->parse('rows','row',True);
--- 92,100 ----
                                                                                
                                                                          
'poll_id' => $GLOBALS['phpgw']->db->f('poll_id')
                                                                                
                                                                          ) ) 
.'">' . lang('Edit') . '</a>');
!                       $GLOBALS['phpgw']->template->set_var('row_delete','<a 
href="' . $GLOBALS['phpgw']->link('/polls/admin_deleteanswer.php',
!                                                                               
                                                                array 
('vote_id' => $GLOBALS['phpgw']->db->f('vote_id'),
!                                                                               
                                                                          
'poll_id' => $GLOBALS['phpgw']->db->f('poll_id')
!                                                                               
                                                                          ) ) 
.'">' . lang('Delete') . '</a>');
! 
                }
                $GLOBALS['phpgw']->template->parse('rows','row',True);

Index: admin_deleteanswer.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_deleteanswer.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** admin_deleteanswer.php      21 Dec 2001 14:59:46 -0000      1.6
--- admin_deleteanswer.php      23 Nov 2002 01:32:11 -0000      1.6.2.1
***************
*** 1,44 ****
! <?php
!   /**************************************************************************\
!   * phpGroupWare - Polls                                                     *
!   * http://www.phpgroupware.org                                              *
!   * --------------------------------------------                             *
!   *  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 (at your  *
!   *  option) any later version.                                              *
!   \**************************************************************************/
! 
!   /* $Id$ */
! 
!       $phpgw_info = array();
!       $GLOBALS['phpgw_info']['flags'] = array(
!               'admin_only'              => True,
!               'currentapp'              => 'polls',
!               'enable_nextmatchs_class' => True,
!               'admin_header'            => True
!       );
!       if ($HTTP_GET_VARS['confirm'])
!       {
!               $GLOBALS['phpgw_info']['flags']['noheader'] = True;
!               $GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
!               $GLOBALS['phpgw_info']['flags']['admin_header'] = False;
!       }
!       include('../header.inc.php');
! 
!       if ($HTTP_GET_VARS['confirm'])
!       {
!               $GLOBALS['phpgw']->db->query("delete from phpgw_polls_data 
where vote_id='" . $HTTP_GET_VARS['vote_id'] . "'");
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers'));
!       }
!       else
!       {
!               echo '<p><br><table border="0" width="40%" 
align="center"><tr><td align="center" colspan="center">';
!               echo lang('Are you sure want to delete this answer ?') . 
'</td></tr>';
!               echo '<tr><td align="left"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers') . '">' . lang('No') 
. '</td>';
!               echo '    <td align="right"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_deleteanswer.php','vote_id='
!                       . $HTTP_GET_VARS['vote_id'] . '&confirm=True') . '">' . 
lang('Yes') . '</td></tr>';
!               echo '</table>';
!       }
!       $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
--- 1,44 ----
! <?php
!   /**************************************************************************\
!   * phpGroupWare - Polls                                                     *
!   * http://www.phpgroupware.org                                              *
!   * --------------------------------------------                             *
!   *  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 (at your  *
!   *  option) any later version.                                              *
!   \**************************************************************************/
! 
!   /* $Id$ */
! 
!       $phpgw_info = array();
!       $GLOBALS['phpgw_info']['flags'] = array(
!               'admin_only'              => True,
!               'currentapp'              => 'polls',
!               'enable_nextmatchs_class' => True,
!               'admin_header'            => True
!       );
!       if ($HTTP_GET_VARS['confirm'])
!       {
!               $GLOBALS['phpgw_info']['flags']['noheader'] = True;
!               $GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
!               $GLOBALS['phpgw_info']['flags']['admin_header'] = False;
!       }
!       include('../header.inc.php');
! 
!       if ($HTTP_GET_VARS['confirm'])
!       {
!               $GLOBALS['phpgw']->db->query("delete from phpgw_polls_data 
where vote_id='" . $HTTP_GET_VARS['vote_id'] . "' AND poll_id=". 
$HTTP_GET_VARS['poll_id']);
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers'));
!       }
!       else
!       {
!               echo '<p><br><table border="0" width="40%" 
align="center"><tr><td align="center" colspan="center">';
!               echo lang('Are you sure want to delete this answer ?') . 
'</td></tr>';
!               echo '<tr><td align="left"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers') . '">' . lang('No') 
. '</td>';
!               echo '    <td align="right"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_deleteanswer.php','vote_id='
!                       . $HTTP_GET_VARS['vote_id'] . '&confirm=True') . '">' . 
lang('Yes') . '</td></tr>';
!               echo '</table>';
!       }
!       $GLOBALS['phpgw']->common->phpgw_footer();
! ?>