[geeklog-cvs] Geeklog-1.x/public_html/polls index.php,1.24,1.25

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/polls
In directory qs1489.pair.com:/tmp/cvs-serv51096/public_html/polls

Modified Files:
	index.php 
Log Message:
Fixed warnings, voting, etc. Some source code cosmetics.


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/polls/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** index.php	25 Nov 2007 06:58:56 -0000	1.24
--- index.php	29 Dec 2007 20:03:09 -0000	1.25
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 1.1                                                          |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
***************
*** 9,13 ****
  // | Display poll results and past polls.                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Display poll results and past polls.                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 35,39 ****
  // $Id$
  
! require_once ('../lib-common.php');
  
  // number of polls to list per page
--- 35,39 ----
  // $Id$
  
! require_once '../lib-common.php';
  
  // number of polls to list per page
***************
*** 81,86 ****
          $defsort_arr = array('field' => 'unixdate', 'direction' => 'desc');
  
-         $menu_arr = array ();
- 
          $text_arr = array('has_menu' =>  false,
                            'title' => $LANG_POLLS['pollstitle'], 'instructions' => "",
--- 81,84 ----
***************
*** 96,100 ****
  
          $retval .= ADMIN_list ('polls', 'plugin_getListField_polls',
!                    $header_arr, $text_arr, $query_arr, $menu_arr, $defsort_arr);
      }
  
--- 94,98 ----
  
          $retval .= ADMIN_list ('polls', 'plugin_getListField_polls',
!                    $header_arr, $text_arr, $query_arr, $defsort_arr);
      }
  
***************
*** 149,157 ****
      $display .= COM_siteHeader ('menu', $LANG_POLLS['pollstitle'])
               . polllist ();
! } else if ((count($_POST['aid']) == $nquestions) && !isset ($_COOKIE['poll-'.$pid])) {
      setcookie ('poll-'.$pid, implode('-',$aid), time() + $_PO_CONF['pollcookietime'],
                 $_CONF['cookie_path'], $_CONF['cookiedomain'],
                 $_CONF['cookiesecure']);
!     $display .= COM_siteHeader() . POLLS_pollsave($pid, $qid, $aid);
  } else if (isset($pid)) {
      $display .= COM_siteHeader();
--- 147,155 ----
      $display .= COM_siteHeader ('menu', $LANG_POLLS['pollstitle'])
               . polllist ();
! } else if ((isset($_POST['aid']) && (count($_POST['aid']) == $nquestions)) && !isset ($_COOKIE['poll-'.$pid])) {
      setcookie ('poll-'.$pid, implode('-',$aid), time() + $_PO_CONF['pollcookietime'],
                 $_CONF['cookie_path'], $_CONF['cookiedomain'],
                 $_CONF['cookiesecure']);
!     $display .= COM_siteHeader() . POLLS_pollsave($pid, $aid);
  } else if (isset($pid)) {
      $display .= COM_siteHeader();