[geeklog-cvs] geeklog-1.3/public_html/admin moderation.php,1.32,1.33

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv27079

Modified Files:
	moderation.php 
Log Message:
Fixed bug #684862 (link to edit submissions for plugins is now index.php instead of <plugintype>.php). Also made sure we always use the submission table name supplied by the plugin (instead of assuming it's "<plugintype>submission").


Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** moderation.php	1 Jan 2003 20:02:19 -0000	1.32
--- moderation.php	21 Mar 2003 14:58:49 -0000	1.33
***************
*** 6,17 ****
  // +---------------------------------------------------------------------------+
  // | moderation.php                                                            |
- // | Geeklog main administration page.                                         |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 6,18 ----
  // +---------------------------------------------------------------------------+
  // | moderation.php                                                            |
  // |                                                                           |
+ // | Geeklog main administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 239,244 ****
              }
              if ($isplugin)  {
!                 $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/plugins/' . $type . '/' 
!                     . $type . '.php?mode=editsubmission&id=' . $A['id']);
              } else {
                  $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/' .  $type
--- 240,246 ----
              }
              if ($isplugin)  {
!                 $mod_templates->set_var ('edit_submission_url',
!                     $_CONF['site_admin_url'] . '/plugins/' . $type
!                     . '/index.php?mode=editsubmission&id=' . $A['id']);
              } else {
                  $mod_templates->set_var('edit_submission_url', $_CONF['site_admin_url'] . '/' .  $type
***************
*** 269,275 ****
          }
      }
! 	
      $retval .= COM_endBlock();
! 	
      return $retval;
  }
--- 271,277 ----
          }
      }
! 
      $retval .= COM_endBlock();
! 
      return $retval;
  }
***************
*** 380,387 ****
              }
              if (empty($mid[$i])) {
!                 $retval .= COM_errorLog("moderation.php just tried deleting everyting in table {$type}submission because it got an empty id.  Please report this immediately to your site administrator");
                  return $retval;
              }
!             DB_delete($_TABLES["{$type}submission"],"$id",$mid[$i]);
              break;
          case 'approve':
--- 382,389 ----
              }
              if (empty($mid[$i])) {
!                 $retval .= COM_errorLog("moderation.php just tried deleting everything in table $submissiontable because it got an empty id.  Please report this immediately to your site administrator");
                  return $retval;
              }
!             DB_delete($submissiontable,"$id",$mid[$i]);
              break;
          case 'approve':
***************
*** 397,401 ****
                  DB_save ($_TABLES['stories'],'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',
                  "{$A['sid']},{$A['uid']},'{$A['tid']}','{$A['title']}','{$A['introtext']}','{$A['related']}','{$A['date']}',{$_CONF['comment_code']},'{$A['postmode']}',{$A['owner_id']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
!                 DB_delete($_TABLES["{$type}submission"],"$id",$mid[$i]);
              } else {
                  // This is called in case this is a plugin. There may be some
--- 399,403 ----
                  DB_save ($_TABLES['stories'],'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',
                  "{$A['sid']},{$A['uid']},'{$A['tid']}','{$A['title']}','{$A['introtext']}','{$A['related']}','{$A['date']}',{$_CONF['comment_code']},'{$A['postmode']}',{$A['owner_id']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
!                 DB_delete($_TABLES["storysubmission"],"$id",$mid[$i]);
              } else {
                  // This is called in case this is a plugin. There may be some
***************
*** 467,471 ****
                      mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
                          $mailtext,
!                         "From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\nReturn-Path: <{$_CONF["site_mail"]}>\nContent-Type: text/plain; charset={$charset}\nX-Mailer: GeekLog $VERSION");
                  }
                  break;
--- 469,473 ----
                      mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
                          $mailtext,
!                         "From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\r\nReturn-Path: <{$_CONF["site_mail"]}>\r\nX-Mailer: GeekLog $VERSION\r\nContent-Type: text/plain; charset={$charset}");
                  }
                  break;