[geeklog-cvs] Geeklog-1.x/public_html/admin moderation.php, 1.122, 1.122.2.1

[Dirk Haun]

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

Modified Files:
      Tag: geeklog_1_5_0_1
	moderation.php 
Log Message:
Started a "bugfixes only" branch for a possible 1.5.0-1 release and ported the first fixes over from the trunk.


Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.122
retrieving revision 1.122.2.1
diff -C2 -d -r1.122 -r1.122.2.1
*** moderation.php	23 May 2008 21:07:14 -0000	1.122
--- moderation.php	20 Jun 2008 19:10:36 -0000	1.122.2.1
***************
*** 222,226 ****
      if ($_CONF['usersubmission'] == 1) {
          if (SEC_hasRights ('user.edit') && SEC_hasRights ('user.delete')) {
!             $retval .= userlist ();
          }
      }
--- 222,226 ----
      if ($_CONF['usersubmission'] == 1) {
          if (SEC_hasRights ('user.edit') && SEC_hasRights ('user.delete')) {
!             $retval .= userlist ($token);
          }
      }
***************
*** 337,341 ****
  *
  */
! function userlist ()
  {
      global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
--- 337,341 ----
  *
  */
! function userlist ($token)
  {
      global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
***************
*** 377,380 ****
--- 377,381 ----
      if ($nrows > 0) {
          $form_arr['bottom'] = '<input type="hidden" name="type" value="user"' . XHTML . '>' . LB
+                 . '<input type="hidden" name="' . CSRF_TOKEN . '" value="' . $token . '"'. XHTML . '>' . LB
                  . '<input type="hidden" name="mode" value="moderation"' . XHTML . '>' . LB
                  . '<input type="hidden" name="count" value="' . $nrows . '"' . XHTML . '>'