[Phpgroupware-cvs] CVS: headlines deleteheadline.php,1.9,1.10

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/headlines
In directory subversions:/tmp/cvs-serv31865

Modified Files:
        deleteheadline.php 
Log Message:
using get_var(), formatting

Index: deleteheadline.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/deleteheadline.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** deleteheadline.php  19 Nov 2001 15:46:14 -0000      1.9
--- deleteheadline.php  3 Apr 2002 14:11:25 -0000       1.10
***************
*** 13,16 ****
--- 13,17 ----
        /* $Id$ */
  
+       $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'              => 'admin',
***************
*** 21,28 ****
        include('../header.inc.php');
  
!       $con     = $GLOBALS['HTTP_POST_VARS']['con'] ? 
$GLOBALS['HTTP_POST_VARS']['con'] : $GLOBALS['HTTP_GET_VARS']['con'];
!       $confirm = $GLOBALS['HTTP_POST_VARS']['confirm'] ? 
$GLOBALS['HTTP_POST_VARS']['confirm'] : $GLOBALS['HTTP_GET_VARS']['confirm'];
  
!       if (($con) && (! $confirm))
        {
                $GLOBALS['phpgw']->common->phpgw_header();
--- 22,29 ----
        include('../header.inc.php');
  
!       $con     = get_var('con',array('POST','GET'));
!       $confirm = get_var('confirm',array('POST','GET'));
  
!       if(($con) && (!$confirm))
        {
                $GLOBALS['phpgw']->common->phpgw_header();
***************
*** 31,35 ****
                // This is done for a reason (jengo)
                
$GLOBALS['phpgw']->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('headlines'));
!       
                $GLOBALS['phpgw']->template->set_file(array(
                        'delete_form' => 'admin_delete.tpl'
--- 32,36 ----
                // This is done for a reason (jengo)
                
$GLOBALS['phpgw']->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('headlines'));
! 
                $GLOBALS['phpgw']->template->set_file(array(
                        'delete_form' => 'admin_delete.tpl'
***************
*** 56,64 ****
  
                $GLOBALS['phpgw']->db->query("SELECT * FROM 
phpgw_preferences",__LINE__,__FILE__);
!               while ($GLOBALS['phpgw']->db->next_record())
                {
!                       if ($GLOBALS['phpgw']->db->f('preference_owner') == 
$GLOBALS['phpgw_info']['user']['account_id'])
                        {
!                               if 
($GLOBALS['phpgw_info']['user']['preferences']['headlines'][$con])
                                {
                                        
$GLOBALS['phpgw']->preferences->delete('headlines',$con);
--- 57,65 ----
  
                $GLOBALS['phpgw']->db->query("SELECT * FROM 
phpgw_preferences",__LINE__,__FILE__);
!               while($GLOBALS['phpgw']->db->next_record())
                {
!                       if($GLOBALS['phpgw']->db->f('preference_owner') == 
$GLOBALS['phpgw_info']['user']['account_id'])
                        {
!                               
if($GLOBALS['phpgw_info']['user']['preferences']['headlines'][$con])
                                {
                                        
$GLOBALS['phpgw']->preferences->delete('headlines',$con);
***************
*** 69,73 ****
                        {
                                $phpgw_newuser['user']['preferences'] = 
$GLOBALS['phpgw']->db->f('preference_value');
!                               if 
($phpgw_newuser['user']['preferences']['headlines'][$con])
                                {
                                        
$GLOBALS['phpgw']->preferences->delete_newuser('headlines',$con);
--- 70,74 ----
                        {
                                $phpgw_newuser['user']['preferences'] = 
$GLOBALS['phpgw']->db->f('preference_value');
!                               
if($phpgw_newuser['user']['preferences']['headlines'][$con])
                                {
                                        
$GLOBALS['phpgw']->preferences->delete_newuser('headlines',$con);