cvs: pearweb /public_html/admin package-approval.php

dufuz		Thu May  8 22:28:12 2008 UTC

  Modified files:              
    /pearweb/public_html/admin	package-approval.php 
  Log:
  Make the page a bit more generic
  use SITE and SITE_BIG
  group constant
  cosmetics
  
http://cvs.php.net/viewvc.cgi/pearweb/public_html/admin/package-approval.php?r1=1.20&r2=1.21&diff_format=u
Index: pearweb/public_html/admin/package-approval.php
diff -u pearweb/public_html/admin/package-approval.php:1.20 pearweb/public_html/admin/package-approval.php:1.21
--- pearweb/public_html/admin/package-approval.php:1.20	Fri Feb  8 23:48:34 2008
+++ pearweb/public_html/admin/package-approval.php	Thu May  8 22:28:11 2008
@@ -15,20 +15,19 @@
    +----------------------------------------------------------------------+
    | Author: Martin Jansen <[email protected]>                                   |
    +----------------------------------------------------------------------+
-   $Id: package-approval.php,v 1.20 2008/02/08 23:48:34 dufuz Exp $
+   $Id: package-approval.php,v 1.21 2008/05/08 22:28:11 dufuz Exp $
 */
 
-auth_require("pear.admin");
+auth_require('pear.admin');
 
-response_header("PEAR Administration :: Package Approval");
+response_header('PEAR Administration :: Package Approval');
 
 echo "<h1>Package Approval</h1>\n";
 
 // Approve package identified by its id
 if (!empty($_GET['approve']) || !empty($_GET['reject'])) {
-
     if (!empty($_GET['approve'])) {
-        $query = "UPDATE packages SET approved = 1 WHERE id = " . (int)$_GET['approve'] . " AND approved = 0";
+        $query = "UPDATE packages SET approved = 1 WHERE approved = 0 AND id = " . (int)$_GET['approve'];
         $id = $_GET['approve'];
         $action = "approved";
     } elseif (!empty($_GET['reject'])) {
@@ -37,12 +36,11 @@
         $action = "rejected";
     }
 
-    $info_query = "SELECT * FROM packages WHERE id = ?";
-    $row = $dbh->getRow($info_query, array($id), DB_FETCHMODE_ASSOC);
-
     $res = $dbh->query($query);
-
     if (!PEAR::isError($res) && $dbh->affectedRows() > 0) {
+        $sql = 'SELECT * FROM packages WHERE id = ?';
+        $row = $dbh->getRow($sql, array($id), DB_FETCHMODE_ASSOC);
+
         if ($action == 'approved') {
              include_once 'pear-rest.php';
             $pear_rest = new pearweb_Channel_REST_Generator(PEAR_REST_PATH);
@@ -57,10 +55,9 @@
 
         $logger = new Damblan_Log;
         $observer = new Damblan_Log_Mail;
-        $observer->setRecipients("[email protected]");
-        $observer->setHeader("In-Reply-To", "<approve-request-" . $row['id'] . "@" . PEAR_CHANNELNAME
-            . ">");
-        $observer->setHeader("Subject", "[PEAR Group] Package " . $row['name'] . " has been " . $action);
+        $observer->setRecipients(PEAR_GROUP_EMAIL);
+        $observer->setHeader("In-Reply-To", "<approve-request-" . $row['id'] . "@" . PEAR_CHANNELNAME . ">");
+        $observer->setHeader("Subject", "[" . SITE_BIG . " Group] Package " . $row['name'] . " has been " . $action);
 
         $logger->attach($observer);
         $logger->log($auth_user->handle . " " . $action . " " . $row['name']);
@@ -73,7 +70,7 @@
             $query = 'SELECT u.email FROM users u, maintains m WHERE m.package = ? AND u.handle = m.handle';
             $rows = $dbh->getAll($query, array($id), DB_FETCHMODE_ASSOC);
             foreach ($rows as $u_row) {
-                mail($u_row['email'], 'PEAR Package ' . $action, $mailtext, 'From: "PEAR Package Approval System" <[email protected]>', '-f [email protected]');
+                mail($u_row['email'], SITE_BIG . ' Package ' . $action, $mailtext, 'From: "' . SITE_BIG . ' Package Approval System" <' . PEAR_GROUP_EMAIL . '>', '-f ' . PEAR_BOUNCE_EMAIL);
             }
         }
 
@@ -85,8 +82,8 @@
     }
 }
 
-$query = "SELECT * FROM packages WHERE approved = 0 AND package_type = 'pear'";
-$rows = $dbh->getAll($query, null, DB_FETCHMODE_ASSOC);
+$query = 'SELECT id, name FROM packages WHERE approved = 0 AND package_type = ?';
+$rows = $dbh->getAll($query, array(SITE), DB_FETCHMODE_ASSOC);
 $self = htmlspecialchars($_SERVER['PHP_SELF']);
 
 if (count($rows) == 0) {