[geeklog-cvs] Geeklog-1.x/plugins/polls functions.inc,1.79,1.80

[Oliver]

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

Modified Files:
	functions.inc 
Log Message:
XHTML optional updates

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/polls/functions.inc,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** functions.inc	9 Oct 2007 10:01:03 -0000	1.79
--- functions.inc	25 Nov 2007 06:56:05 -0000	1.80
***************
*** 124,128 ****
      } else { // success
          $retval = COM_refresh ($_CONF['site_url']
!                                 . "/polls/index.php?pid=$id&aid=-1");
      }
  
--- 124,128 ----
      } else { // success
          $retval = COM_refresh ($_CONF['site_url']
!                                 . "/polls/index.php?pid=$id&aid=-1");
      }
  
***************
*** 152,156 ****
          CMT_deleteComment($cid, $id, 'polls');
          $retval .= COM_refresh ($_CONF['site_url']
!                                  . "/polls/index.php?pid=$id&aid=-1");
      } else {
          COM_errorLog ("User {$_USER['username']} (IP: {$_SERVER['REMOTE_ADDR']}) "
--- 152,156 ----
          CMT_deleteComment($cid, $id, 'polls');
          $retval .= COM_refresh ($_CONF['site_url']
!                                  . "/polls/index.php?pid=$id&aid=-1");
      } else {
          COM_errorLog ("User {$_USER['username']} (IP: {$_SERVER['REMOTE_ADDR']}) "
***************
*** 476,479 ****
--- 476,480 ----
                                          'pquestions' => 'pollquestions.thtml',
                                          'comments' => 'pollcomments.thtml'));
+                 $poll->set_var('xhtml', XHTML);
                  $poll->set_var('site_url', $_CONF['site_url']);
                  $poll->set_var('layout_url', $_CONF['layout_url']);
***************
*** 769,772 ****
--- 770,774 ----
                  'votes_bar' => 'pollvotes_bar.thtml',
                  'votes_num' => 'pollvotes_num.thtml' ));
+             $poll->set_var('xhtml', XHTML);
              $poll->set_var('site_url', $_CONF['site_url']);
              $poll->set_var('layout_url', $_CONF['layout_url']);
***************
*** 846,850 ****
                  if (($scale < 100) && ($j < 1)) {
                      $url = $_CONF['site_url'] . "/polls/index.php?pid=$pid";
!                     $poll->set_var('notification', COM_createLink($LANG25[40], $url). "<br>");
                      break;
                  }
--- 848,852 ----
                  if (($scale < 100) && ($j < 1)) {
                      $url = $_CONF['site_url'] . "/polls/index.php?pid=$pid";
!                     $poll->set_var('notification', COM_createLink($LANG25[40], $url). "<br" . XHTML . ">");
                      break;
                  }
***************
*** 1074,1078 ****
      $str = null;
      $str = '<link rel="stylesheet" type="text/css" href="'
!         . $_CONF['site_url'] . '/polls/style.css">';
  
      return $str;
--- 1076,1080 ----
      $str = null;
      $str = '<link rel="stylesheet" type="text/css" href="'
!         . $_CONF['site_url'] . '/polls/style.css"' . XHTML . '>';
  
      return $str;