[Phpgroupware-cvs] polls/inc functions.inc.php,1.11.2.1.2.6

[skwashd]

Update of polls/inc

Modified Files:
     Branch: Version-0_9_16-branch
            functions.inc.php lines: +21 -13

Log Message:
globals, E_NOTICE, formatting & a variaton on patch #4476

====================================================
Index: polls/inc/functions.inc.php
diff -u polls/inc/functions.inc.php:1.11.2.1.2.5 
polls/inc/functions.inc.php:1.11.2.1.2.6
--- polls/inc/functions.inc.php:1.11.2.1.2.5    Thu Jul 15 02:07:00 2004
+++ polls/inc/functions.inc.php Thu Dec  8 11:44:59 2005
@@ -13,10 +13,10 @@

   /* $Id$ */

-       $GLOBALS['phpgw']->db->query("select * from phpgw_polls_settings");
+       $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');
+               
$GLOBALS['poll_settings'][$GLOBALS['phpgw']->db->f('setting_name', true)] = 
$GLOBALS['phpgw']->db->f('setting_value');
        }

        function add_template_row(&$tpl,$label,$value)
@@ -35,12 +35,12 @@
                        return True;
                }

-               $GLOBALS['phpgw']->db->query('SELECT COUNT(*) as cnt FROM 
phpgw_polls_user '
-                       . 'WHERE user_id=' . 
intval($GLOBALS['phpgw_info']['user']['account_id'])
-                               . " AND poll_id = $poll_id",__LINE__,__FILE__);
+               $GLOBALS['phpgw']->db->query("SELECT COUNT(*) as cnt 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();

-               return ($GLOBALS['phpgw']->db->f(cnt) == 0) ? True : False;
+               return ($GLOBALS['phpgw']->db->f('cnt') == 0) ? True : False;
        }

        function poll_viewResults($poll_id)
@@ -48,9 +48,9 @@
                $poll_id = intval($poll_id);
                $GLOBALS['phpgw']->db->query("SELECT SUM(option_count) AS cnt 
FROM phpgw_polls_data WHERE poll_id = $poll_id",__LINE__,__FILE__);
                $GLOBALS['phpgw']->db->next_record();
-               $poll_sum = intval($GLOBALS['phpgw']->db->f(cnt));
+               $poll_sum = intval($GLOBALS['phpgw']->db->f('cnt'));

-               $GLOBALS['phpgw']->db->query("select poll_title from 
phpgw_polls_desc where poll_id=$poll_id",__LINE__,__FILE__);
+               $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%">';
@@ -138,11 +138,19 @@

        function poll_generateUI($poll_id = '')
        {
+               $poll_id = intval($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 ( $GLOBALS['phpgw']->db->next_record() )
+                       {
+                               $poll_id = $GLOBALS['phpgw']->db->f(0);
+                       }
+                       else //stop new installs looking broken
+                       {
+                               echo lang('no poll available, please contact 
your system administrator');
+                               return False;
+                       }
                }

                if (! verify_uservote($poll_id))
@@ -150,7 +158,7 @@
                        return False;
                }

-               $GLOBALS['phpgw']->db->query('SELECT poll_title FROM 
phpgw_polls_desc WHERE poll_id = ' . intval($poll_id),__LINE__,__FILE__);
+               $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";
@@ -163,7 +171,7 @@
                        . $GLOBALS['phpgw']->db->f('poll_title', True) . 
'&nbsp;</td>' . "\n"
                        . ' </tr>' . "\n";

-               $GLOBALS['phpgw']->db->query('SELECT * FROM phpgw_polls_data 
WHERE poll_id = ' . intval($poll_id),__LINE__,__FILE__);
+               $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);