[geeklog-cvs] Geeklog-1.x/plugins/polls functions.inc,1.77,1.78

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/polls
In directory qs1489.pair.com:/tmp/cvs-serv46453

Modified Files:
	functions.inc 
Log Message:
fix multiple polls display
use edit icon everwhere
use COM_createIcon

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/polls/functions.inc,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** functions.inc	9 Oct 2007 08:44:08 -0000	1.77
--- functions.inc	9 Oct 2007 09:14:02 -0000	1.78
***************
*** 479,482 ****
--- 479,483 ----
                  $poll->set_var('layout_url', $_CONF['layout_url']);
                  $poll->set_var('poll_id', $pid );
+                 $poll->set_var('poll_topic', $P['topic'] );
                  $poll->set_var('num_votes', COM_numberFormat($P['voters']));
                  $poll->set_var('poll_vote_url', $_CONF['site_url']
***************
*** 500,503 ****
--- 501,507 ----
                      $topic['perm_group'],$topic['perm_members'],$topic['perm_anon']);
                  if ($access == 3) {
+                     $editlink = COM_createLink($LANG25[27], $_CONF['site_admin_url']
+                         . '/plugins/polls/index.php?mode=edit&pid=' . $pid );
+                     $poll->set_var('edit_link', $editlink);
                      $editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
                      $icon_attr = array('title' => $LANG25[27]);
***************
*** 626,633 ****
                  $pid = $Q['pid'];
                  if ($size < 120) {// assume we're in the poll block
!                     if($i > 1) {
                          $retval .= COM_startBlock($title, '',
                               COM_getBlockTemplate('poll_block', 'header'));
!                     }
                      $showall = false;
                  } else { // assume we're in polls/index.php
--- 630,637 ----
                  $pid = $Q['pid'];
                  if ($size < 120) {// assume we're in the poll block
!                     /*if($i > 1) {
                          $retval .= COM_startBlock($title, '',
                               COM_getBlockTemplate('poll_block', 'header'));
!                     }*/
                      $showall = false;
                  } else { // assume we're in polls/index.php
***************
*** 643,649 ****
  
                  if ($size < 120) {
!                     if ($i < $nrows) {
                          $retval .= COM_endBlock(COM_getBlockTemplate(
                               'poll_block', 'footer'));
                      }
                  } else {
--- 647,655 ----
  
                  if ($size < 120) {
!                     if ($i == $nrows) {
                          $retval .= COM_endBlock(COM_getBlockTemplate(
                               'poll_block', 'footer'));
+                     } else {
+                         $retval .= "<br>";
                      }
                  } else {
***************
*** 721,725 ****
  function POLLS_pollResults($pid, $scale=400, $order='', $mode='')
  {
!     global $_CONF, $_TABLES, $_USER,
             $_PO_CONF, $LANG01, $LANG_POLLS, $_COM_VERBOSE, $LANG25;
  
--- 727,731 ----
  function POLLS_pollResults($pid, $scale=400, $order='', $mode='')
  {
!     global $_CONF, $_TABLES, $_USER, $_IMAGE_TYPE,
             $_PO_CONF, $LANG01, $LANG_POLLS, $_COM_VERBOSE, $LANG25;
  
***************
*** 779,785 ****
                  $P['perm_group'],$P['perm_members'],$P['perm_anon']);
              if ($access == 3) {
!                 $editlink .= COM_createLink($LANG25[27], $_CONF['site_admin_url']
!                     . '/plugins/polls/index.php?mode=edit&pid=' . $pid);
!                 $poll->set_var('poll_edit', $editlink);
              }
              if ($_PO_CONF['answerorder'] == 'voteorder'){
--- 785,797 ----
                  $P['perm_group'],$P['perm_members'],$P['perm_anon']);
              if ($access == 3) {
!                 $editlink = COM_createLink($LANG25[27], $_CONF['site_admin_url']
!                     . '/plugins/polls/index.php?mode=edit&pid=' . $pid );
!                 $poll->set_var('edit_link', $editlink);
!                 $editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
!                 $icon_attr = array('title' => $LANG25[27]);
!                 $editiconhtml = COM_createImage($editicon, $LANG25[27], $icon_attr);
!                 $editlink = COM_createLink($editiconhtml, $_CONF['site_admin_url']
!                     . '/plugins/polls/index.php?mode=edit&pid=' . $pid );
!                 $poll->set_var('edit_icon', $editlink);
              }
              if ($_PO_CONF['answerorder'] == 'voteorder'){