[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: polls/inc functions.inc.php,1.11,1.11.2.1
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: polls/inc functions.inc.php,1.11,1.11.2.1 |
|
Date: |
Fri, 22 Nov 2002 20:24:12 -0500 |
Update of /cvsroot/phpgroupware/polls/inc
In directory subversions:/tmp/cvs-serv24586/inc
Modified Files:
Tag: Version-0_9_14-branch
functions.inc.php
Log Message:
fixing the broken fix and a few other bugs
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/polls/inc/functions.inc.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** functions.inc.php 21 Dec 2001 14:59:46 -0000 1.11
--- functions.inc.php 23 Nov 2002 01:24:10 -0000 1.11.2.1
***************
*** 1,203 ****
! <?php
! /**************************************************************************\
! * phpGroupWare - Polls *
! * http://www.phpgroupware.org *
! * The file is based on phpPolls *
! * Copyright (c) 1999 Till Gerken (address@hidden)
*
! * -------------------------------------------- *
! * 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$ */
!
! $GLOBALS['phpgw']->db->query("select * from phpgw_polls_settings");
! while ($GLOBALS['phpgw']->db->next_record())
! {
!
$GLOBALS['poll_settings'][$GLOBALS['phpgw']->db->f('setting_name')] =
$GLOBALS['phpgw']->db->f('setting_value');
! }
!
! function add_template_row(&$tpl,$label,$value)
! {
!
$GLOBALS['phpgw']->nextmatchs->template_alternate_row_color(&$tpl);
! $tpl->set_var('td_1',$label);
! $tpl->set_var('td_2',$value);
! $tpl->parse('rows','row',True);
! }
!
! function verify_uservote($poll_id)
! {
! if ($GLOBALS['poll_settings']['allow_multiable_votes'])
! {
! return True;
! }
!
! $GLOBALS['phpgw']->db->query("select count(*) from
phpgw_polls_user where user_id='" . $GLOBALS['phpgw_info']['user']['account_id']
! . "' and poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! if ($GLOBALS['phpgw']->db->f(0) == 0)
! {
! return True;
! }
! else
! {
! return False;
! }
! // return ($db->f(0)?True:False);
! }
!
! function poll_viewResults($poll_id)
! {
! $GLOBALS['phpgw']->db->query("SELECT SUM(option_count) AS sum
FROM phpgw_polls_data WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_sum = (int)$GLOBALS['phpgw']->db->f(0);
!
! $GLOBALS['phpgw']->db->query("select poll_title from
phpgw_polls_desc where poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! echo '<p><table border="0" align="center" width="50%">';
! echo ' <tr>' . "\n"
! . ' <td colspan="3" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg'] . '" align="center">'
! . $GLOBALS['phpgw']->db->f('poll_title') . '</td>' .
"\n"
! . '</tr>' . "\n";
!
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $poll_optionText =
$GLOBALS['phpgw']->db->f('option_text');
! $poll_optionCount =
$GLOBALS['phpgw']->db->f('option_count');
!
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <tr bgcolor="' . $tr_color . '">' . "\n";
!
! if ($poll_optionText != '')
! {
! echo " <td>$poll_optionText</td>\n";
!
! if ($poll_sum)
! {
! $poll_percent = 100 * $poll_optionCount
/ $poll_sum;
! }
! else
! {
! $poll_percent = 0;
! }
!
! if ($poll_percent > 0)
! {
! $poll_percentScale =
(int)($poll_percent * 1);
! echo ' <td><img src="' .
$GLOBALS['phpgw_info']['server']['webserver_url']
! . '/polls/images/pollbar.gif"
height="12" width="' . $poll_percentScale
! . '"></td>' . "\n";
! }
! else
! {
! echo ' <td> </td>' . "\n";
! }
!
! printf(' <td> %.2f %% (%d)</td>' . "\n" . '
</tr>' . "\n", $poll_percent, $poll_optionCount);
!
! echo ' </tr>' . "\n";
! }
! }
!
! echo ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td>' . lang('Total votes') . ': ' . $poll_sum .
'</td>' . "\n"
! . ' </tr>' . "\n"
! . '</table>' . "\n";
! }
!
! function poll_getResults($poll_id)
! {
! $ret = array();
!
! $GLOBALS['phpgw']->db->query("SELECT SUM(option_count) AS sum
FROM phpgw_polls_data WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_sum = $GLOBALS['phpgw']->db->f('sum');
!
! $GLOBALS['phpgw']->db->query("SELECT poll_title FROM
phpgw_polls_desc WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! $poll_title = $GLOBALS['phpgw']->db->f('poll_title');
!
! $ret[0] = array(
! 'title' => $poll_title,
! 'votes' => $poll_sum
! );
!
! // select next vote option
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $ret[] = array(
! 'text' =>
$GLOBALS['phpgw']->db->f('option_text'),
! 'votes' =>
$GLOBALS['phpgw']->db->f('option_count')
! );
! }
!
! return $ret;
! }
!
! function poll_generateUI($poll_id = '')
! {
! if (! $poll_id)
! {
! $GLOBALS['phpgw']->db->query("select max(poll_id) from
phpgw_polls_desc",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_id = $GLOBALS['phpgw']->db->f(0);
! }
!
! if (! verify_uservote($poll_id))
! {
! return False;
! }
!
! $GLOBALS['phpgw']->db->query("select poll_title from
phpgw_polls_desc where poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! echo "\n";
! echo '<form action="' .
$GLOBALS['phpgw']->link('/polls/vote.php') . '" method="post">' . "\n";
! echo '<input type="hidden" name="poll_id" value="' . $poll_id .
'">' . "\n";
! // echo '<input type="hidden" name="poll_forwarder" value="' .
$poll_forwarder . '">';
! echo '<table border="0" align="center" width="50%">' . "\n"
! . ' <tr>' . "\n"
! . ' <td colspan="2" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg'] . '" align="center"> '
! . $GLOBALS['phpgw']->db->f('poll_title') .
' </td>' . "\n"
! . ' </tr>' . "\n";
!
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <tr bgcolor="' . $tr_color . '">' . "\n"
! . ' <td align="center"><input type="radio"
name="poll_voteNr" value="'
! . $GLOBALS['phpgw']->db->f('vote_id') .
'"></td>' . "\n"
! . ' <td> ' .
$GLOBALS['phpgw']->db->f('option_text') . '</td>' . "\n"
! . ' </tr>' . "\n";
! }
!
! echo ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td colspan="2"> </td>' . "\n"
! . ' </tr>' . "\n"
! . ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td colspan="2" align="center">'
! . ' <input name="submit" type="submit" value="' .
lang('Vote') . '"></td>' . "\n"
! . ' </tr>' . "\n"
! . '</table>' . "\n" . '</form>' . "\n";
! }
!
! function display_poll()
! {
! if (! verify_uservote($GLOBALS['poll_settings']['currentpoll']))
! {
!
poll_viewResults($GLOBALS['poll_settings']['currentpoll']);
! }
! else
! {
!
poll_generateUI($GLOBALS['poll_settings']['currentpoll']);
! }
! }
! ?>
--- 1,203 ----
! <?php
! /**************************************************************************\
! * phpGroupWare - Polls *
! * http://www.phpgroupware.org *
! * The file is based on phpPolls *
! * Copyright (c) 1999 Till Gerken (address@hidden)
*
! * -------------------------------------------- *
! * 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$ */
!
! $GLOBALS['phpgw']->db->query("select * from phpgw_polls_settings");
! while ($GLOBALS['phpgw']->db->next_record())
! {
!
$GLOBALS['poll_settings'][$GLOBALS['phpgw']->db->f('setting_name')] =
$GLOBALS['phpgw']->db->f('setting_value');
! }
!
! function add_template_row(&$tpl,$label,$value)
! {
!
$GLOBALS['phpgw']->nextmatchs->template_alternate_row_color($tpl);
! $tpl->set_var('td_1',$label);
! $tpl->set_var('td_2',$value);
! $tpl->parse('rows','row',True);
! }
!
! function verify_uservote($poll_id)
! {
! if ($GLOBALS['poll_settings']['allow_multiable_votes'])
! {
! return True;
! }
!
! $GLOBALS['phpgw']->db->query("select count(*) from
phpgw_polls_user where user_id='" . $GLOBALS['phpgw_info']['user']['account_id']
! . "' and poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! if ($GLOBALS['phpgw']->db->f(0) == 0)
! {
! return True;
! }
! else
! {
! return False;
! }
! // return ($db->f(0)?True:False);
! }
!
! function poll_viewResults($poll_id)
! {
! $GLOBALS['phpgw']->db->query("SELECT SUM(option_count) AS sum
FROM phpgw_polls_data WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_sum = (int)$GLOBALS['phpgw']->db->f(0);
!
! $GLOBALS['phpgw']->db->query("select poll_title from
phpgw_polls_desc where poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! echo '<p><table border="0" align="center" width="50%">';
! echo ' <tr>' . "\n"
! . ' <td colspan="3" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg'] . '" align="center">'
! . $GLOBALS['phpgw']->db->f('poll_title') . '</td>' .
"\n"
! . '</tr>' . "\n";
!
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $poll_optionText =
$GLOBALS['phpgw']->db->f('option_text');
! $poll_optionCount =
$GLOBALS['phpgw']->db->f('option_count');
!
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <tr bgcolor="' . $tr_color . '">' . "\n";
!
! if ($poll_optionText != '')
! {
! echo " <td>$poll_optionText</td>\n";
!
! if ($poll_sum)
! {
! $poll_percent = 100 * $poll_optionCount
/ $poll_sum;
! }
! else
! {
! $poll_percent = 0;
! }
!
! if ($poll_percent > 0)
! {
! $poll_percentScale =
(int)($poll_percent * 1);
! echo ' <td><img src="' .
$GLOBALS['phpgw_info']['server']['webserver_url']
! . '/polls/images/pollbar.gif"
height="12" width="' . $poll_percentScale
! . '"></td>' . "\n";
! }
! else
! {
! echo ' <td> </td>' . "\n";
! }
!
! printf(' <td> %.2f %% (%d)</td>' . "\n" . '
</tr>' . "\n", $poll_percent, $poll_optionCount);
!
! echo ' </tr>' . "\n";
! }
! }
!
! echo ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td>' . lang('Total votes') . ': ' . $poll_sum .
'</td>' . "\n"
! . ' </tr>' . "\n"
! . '</table>' . "\n";
! }
!
! function poll_getResults($poll_id)
! {
! $ret = array();
!
! $GLOBALS['phpgw']->db->query("SELECT SUM(option_count) AS sum
FROM phpgw_polls_data WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_sum = $GLOBALS['phpgw']->db->f('sum');
!
! $GLOBALS['phpgw']->db->query("SELECT poll_title FROM
phpgw_polls_desc WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! $poll_title = $GLOBALS['phpgw']->db->f('poll_title');
!
! $ret[0] = array(
! 'title' => $poll_title,
! 'votes' => $poll_sum
! );
!
! // select next vote option
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $ret[] = array(
! 'text' =>
$GLOBALS['phpgw']->db->f('option_text'),
! 'votes' =>
$GLOBALS['phpgw']->db->f('option_count')
! );
! }
!
! return $ret;
! }
!
! function poll_generateUI($poll_id = '')
! {
! if (! $poll_id)
! {
! $GLOBALS['phpgw']->db->query("select max(poll_id) from
phpgw_polls_desc",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
! $poll_id = $GLOBALS['phpgw']->db->f(0);
! }
!
! if (! verify_uservote($poll_id))
! {
! return False;
! }
!
! $GLOBALS['phpgw']->db->query("select poll_title from
phpgw_polls_desc where poll_id='$poll_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! echo "\n";
! echo '<form action="' .
$GLOBALS['phpgw']->link('/polls/vote.php') . '" method="post">' . "\n";
! echo '<input type="hidden" name="poll_id" value="' . $poll_id .
'">' . "\n";
! // echo '<input type="hidden" name="poll_forwarder" value="' .
$poll_forwarder . '">';
! echo '<table border="0" align="center" width="50%">' . "\n"
! . ' <tr>' . "\n"
! . ' <td colspan="2" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg'] . '" align="center"> '
! . $GLOBALS['phpgw']->db->f('poll_title') .
' </td>' . "\n"
! . ' </tr>' . "\n";
!
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_polls_data
WHERE poll_id='$poll_id'",__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <tr bgcolor="' . $tr_color . '">' . "\n"
! . ' <td align="center"><input type="radio"
name="poll_voteNr" value="'
! . $GLOBALS['phpgw']->db->f('vote_id') .
'"></td>' . "\n"
! . ' <td> ' .
$GLOBALS['phpgw']->db->f('option_text') . '</td>' . "\n"
! . ' </tr>' . "\n";
! }
!
! echo ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td colspan="2"> </td>' . "\n"
! . ' </tr>' . "\n"
! . ' <tr bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bgcolor'] . '">' . "\n"
! . ' <td colspan="2" align="center">'
! . ' <input name="submit" type="submit" value="' .
lang('Vote') . '"></td>' . "\n"
! . ' </tr>' . "\n"
! . '</table>' . "\n" . '</form>' . "\n";
! }
!
! function display_poll()
! {
! if (! verify_uservote($GLOBALS['poll_settings']['currentpoll']))
! {
!
poll_viewResults($GLOBALS['poll_settings']['currentpoll']);
! }
! else
! {
!
poll_generateUI($GLOBALS['poll_settings']['currentpoll']);
! }
! }
! ?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: polls/inc functions.inc.php,1.11,1.11.2.1,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: polls/templates/default admin_form.tpl,1.8,1.8.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: polls admin.php,1.16.2.1,1.16.2.2 admin_addanswer.php,1.14.2.1,1.14.2.2 admin_editanswer.php,1.6,1.6.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: polls/templates/default admin_form.tpl,1.8,1.8.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: polls admin.php,1.16.2.1,1.16.2.2 admin_addanswer.php,1.14.2.1,1.14.2.2 admin_editanswer.php,1.6,1.6.2.1
- Index(es):