[Phpgroupware-cvs] polls admin_deleteanswer.php admin_deletequesti...

[Caeies]

CVSROOT:        /cvsroot/phpgroupware
Module name:    polls
Changes by:     Caeies <Caeies> 07/01/24 16:41:00

Modified files:
        .              : admin_deleteanswer.php admin_deletequestion.php 
                         admin_editanswer.php admin_editquestion.php 
        inc            : header.inc.php 

Log message:
        some call to link() fixed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/polls/admin_deleteanswer.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/polls/admin_deletequestion.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/polls/admin_editanswer.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/polls/admin_editquestion.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/polls/inc/header.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9

Patches:
Index: admin_deleteanswer.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_deleteanswer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- admin_deleteanswer.php      30 Apr 2002 00:15:17 -0000      1.7
+++ admin_deleteanswer.php      24 Jan 2007 16:40:59 -0000      1.8
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: admin_deleteanswer.php,v 1.7 2002/04/30 00:15:17 skeeter Exp $ */
+  /* $Id: admin_deleteanswer.php,v 1.8 2007/01/24 16:40:59 Caeies Exp $ */
 
        $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -30,13 +30,13 @@
        if(get_var('confirm',Array('GET')))
        {
                $GLOBALS['phpgw']->db->query("delete from phpgw_polls_data 
where vote_id='".$vote_id."'",__LINE__,__FILE__);
-               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers'));
+               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('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 '<tr><td align="left"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('show' => 'answers')) . '">' 
. lang('No') . '</td>';
                echo '    <td align="right"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_deleteanswer.php','vote_id='
                        .$vote_id.'&confirm=True') . '">' . lang('Yes') . 
'</td></tr>';
                echo '</table>';

Index: admin_deletequestion.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_deletequestion.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin_deletequestion.php    30 Apr 2002 00:15:17 -0000      1.5
+++ admin_deletequestion.php    24 Jan 2007 16:40:59 -0000      1.6
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: admin_deletequestion.php,v 1.5 2002/04/30 00:15:17 skeeter Exp $ */
+  /* $Id: admin_deletequestion.php,v 1.6 2007/01/24 16:40:59 Caeies Exp $ */
 
        $GLOBALS['phpgw_info'] = array();
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -34,13 +34,13 @@
                $GLOBALS['phpgw']->db->query("select MAX(poll_id) from 
phpgw_polls_desc",__LINE__,__FILE__);
                $max = $GLOBALS['phpgw']->db->f('1');
                $GLOBALS['phpgw']->db->query("update phpgw_polls_settings set 
setting_value='$max' where setting_name='currentpoll'");
-               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=questions'));
+               Header('Location: ' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('show' => 'questions')));
        }
        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 question ?') . 
'</td></tr>';
-               echo '<tr><td align="left"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=questions') . '">' . 
lang('No') . '</td>';
+               echo '<tr><td align="left"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('show' => 'questions')) . 
'">' . lang('No') . '</td>';
                echo '    <td align="right"><a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_deletequestion.php','poll_id='
                        . $poll_id .'&confirm=True') . '">' . lang('Yes') . 
'</td></tr>';
                echo '</table>';

Index: admin_editanswer.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_editanswer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- admin_editanswer.php        15 Nov 2002 09:07:42 -0000      1.7
+++ admin_editanswer.php        24 Jan 2007 16:40:59 -0000      1.8
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: admin_editanswer.php,v 1.7 2002/11/15 09:07:42 skwashd Exp $ */
+  /* $Id: admin_editanswer.php,v 1.8 2007/01/24 16:40:59 Caeies Exp $ */
 
        $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -45,7 +45,7 @@
        
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/polls/admin_editanswer.php','vote_id='
 . $vote_id));
        $GLOBALS['phpgw']->template->set_var('form_button_1','<input 
type="submit" name="submit" value="' . lang('Edit') . '">');
-       $GLOBALS['phpgw']->template->set_var('form_button_2','</form><form 
method="POST" action="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers')
+       $GLOBALS['phpgw']->template->set_var('form_button_2','</form><form 
method="POST" action="' . $GLOBALS['phpgw']->link('/polls/admin.php', 
array('show' => 'answers'))
                . '"><input type="submit" name="submit" value="' . 
lang('Cancel') . '">'
        );
 

Index: admin_editquestion.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/admin_editquestion.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- admin_editquestion.php      15 Nov 2002 09:39:41 -0000      1.9
+++ admin_editquestion.php      24 Jan 2007 16:40:59 -0000      1.10
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: admin_editquestion.php,v 1.9 2002/11/15 09:39:41 skwashd Exp $ */
+  /* $Id: admin_editquestion.php,v 1.10 2007/01/24 16:40:59 Caeies Exp $ */
 
        $GLOBALS['phpgw_info'] = array();
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -47,7 +47,7 @@
        $GLOBALS['phpgw']->template->set_var('poll_id',$poll_id);
        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/polls/admin_editquestion.php','poll_id='
 . $poll_id));
        $GLOBALS['phpgw']->template->set_var('form_button_1','<input 
type="submit" name="edit" value="' . lang('Edit') . '">');
-       $GLOBALS['phpgw']->template->set_var('form_button_2','</form><form 
method="POST" action="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=questions')
+       $GLOBALS['phpgw']->template->set_var('form_button_2','</form><form 
method="POST" action="' . $GLOBALS['phpgw']->link('/polls/admin.php', 
array('show' => 'questions'))
                . '"><input type="submit" name="submit" value="' . 
lang('Cancel') . '">'
        );
 

Index: inc/header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/inc/header.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/header.inc.php  21 Dec 2001 14:59:46 -0000      1.8
+++ inc/header.inc.php  24 Jan 2007 16:40:59 -0000      1.9
@@ -9,7 +9,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: header.inc.php,v 1.8 2001/12/21 14:59:46 milosch Exp $ */
+       /* $Id: header.inc.php,v 1.9 2007/01/24 16:40:59 Caeies Exp $ */
 
        if ($GLOBALS['phpgw_info']['flags']['admin_header'])
        {
@@ -18,8 +18,8 @@
 
                $tpl->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
                $tpl->set_var('info',lang('Voting booth administration'));
-               $tpl->set_var('link_list_questions','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=questions') . '">' . 
lang('Show questions') . '</a>');
-               $tpl->set_var('link_list_answers','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php','show=answers') . '">' . lang('Show 
answers') . '</a>');
+               $tpl->set_var('link_list_questions','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('show' => 'questions')) . 
'">' . lang('Show questions') . '</a>');
+               $tpl->set_var('link_list_answers','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin.php', array('show' => 'answers')) . '">' 
. lang('Show answers') . '</a>');
                $tpl->set_var('link_questions','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_addquestion.php') . '">' . lang('Add 
questions') . '</a>');
                $tpl->set_var('link_answers','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_addanswer.php') . '">' . lang('Add 
answers') . '</a>');
                $tpl->set_var('link_settings','<a href="' . 
$GLOBALS['phpgw']->link('/polls/admin_settings.php') . '">' . lang('Poll 
settings') . '</a>');