cvs: pearweb /public_html/bugs bug.php /public_html/bugs/include functions.inc

cellog          Wed Apr 25 02:28:07 2007 UTC

  Modified files:              
    /pearweb/public_html/bugs   bug.php 
    /pearweb/public_html/bugs/include   functions.inc 
  Log:
  fix Bug #10833        many, many notices in bug.php/functions.inc
  
http://cvs.php.net/viewvc.cgi/pearweb/public_html/bugs/bug.php?r1=1.155&r2=1.156&diff_format=u
Index: pearweb/public_html/bugs/bug.php
diff -u pearweb/public_html/bugs/bug.php:1.155 
pearweb/public_html/bugs/bug.php:1.156
--- pearweb/public_html/bugs/bug.php:1.155      Sun Apr 22 03:41:42 2007
+++ pearweb/public_html/bugs/bug.php    Wed Apr 25 02:28:07 2007
@@ -15,7 +15,7 @@
  * @package   Bugs
  * @copyright Copyright (c) 1997-2005 The PHP Group
  * @license   http://www.php.net/license/3_0.txt  PHP License
- * @version   $Id: bug.php,v 1.155 2007/04/22 03:41:42 dufuz Exp $
+ * @version   $Id: bug.php,v 1.156 2007/04/25 02:28:07 cellog Exp $
  */
 
 /*
@@ -339,7 +339,7 @@
 } elseif (isset($_POST['ncomment']) && isset($_POST['preview']) && $edit == 3) 
{
     $ncomment = trim($_POST['ncomment']);
 
-} elseif ($_POST['in'] && !isset($_POST['preview']) && $edit == 2) {
+} elseif (isset($_POST['in']) && !isset($_POST['preview']) && $edit == 2) {
     // Edits submitted by original reporter for old bugs
 
     if (!$bug['passwd'] || $bug['passwd'] != $pw) {
@@ -403,10 +403,10 @@
             $dbh->query($query);
         }
     }
-} elseif ($_POST['in'] && isset($_POST['preview']) && $edit == 2) {
+} elseif (isset($_POST['in']) && isset($_POST['preview']) && $edit == 2) {
     $ncomment = trim($_POST['ncomment']);
     $from = rinse($_POST['in']['commentemail']);
-} elseif ($_POST['in']  && !isset($_POST['preview']) && $edit == 1) {
+} elseif (isset($_POST['in'])  && !isset($_POST['preview']) && $edit == 1) {
     // Edits submitted by developer
 
     if (!verify_password($user, $pw)) {
@@ -524,17 +524,17 @@
             $dbh->query($query, array($id, $from, $ncomment, $comment_name, 
$auth_user->handle));
         }
     }
-} elseif ($_POST['in'] && isset($_POST['preview']) && $edit == 1) {
+} elseif (isset($_POST['in']) && isset($_POST['preview']) && $edit == 1) {
     $ncomment = trim($_POST['ncomment']);
     $from = $auth_user->email;
-} elseif ($_POST['in']) {
+} elseif (isset($_POST['in'])) {
     $errors[] = 'Invalid edit mode.';
     $ncomment = '';
 } else {
     $ncomment = '';
 }
 
-if ($_POST['in'] && (!isset($_POST['preview']) && $ncomment ||
+if (isset($_POST['in']) && (!isset($_POST['preview']) && $ncomment ||
       $previous != $current)) {
     if (!$errors) {
         if (!isset($buggie)) {
@@ -553,6 +553,9 @@
 response_header("$bug_type #$id :: " . htmlspecialchars($bug['sdesc']));
 
 // DISPLAY BUG
+if (!isset($_GET['thanks'])) {
+    $_GET['thanks'] = 0;
+}
 if ($_GET['thanks'] == 1 || $_GET['thanks'] == 2) {
     display_bug_success('The bug was updated successfully.');
 
http://cvs.php.net/viewvc.cgi/pearweb/public_html/bugs/include/functions.inc?r1=1.148&r2=1.149&diff_format=u
Index: pearweb/public_html/bugs/include/functions.inc
diff -u pearweb/public_html/bugs/include/functions.inc:1.148 
pearweb/public_html/bugs/include/functions.inc:1.149
--- pearweb/public_html/bugs/include/functions.inc:1.148        Tue Apr 24 
21:45:27 2007
+++ pearweb/public_html/bugs/include/functions.inc      Wed Apr 25 02:28:07 2007
@@ -15,7 +15,7 @@
  * @package   Bugs
  * @copyright Copyright (c) 1997-2005 The PHP Group
  * @license   http://www.php.net/license/3_0.txt  PHP License
- * @version   $Id: functions.inc,v 1.148 2007/04/24 21:45:27 davidc Exp $
+ * @version   $Id: functions.inc,v 1.149 2007/04/25 02:28:07 cellog Exp $
  */
 
 
@@ -240,8 +240,10 @@
  */
 function txfield($n)
 {
-    return oneof(rinse($_POST['in'][$n]),
-                 $GLOBALS['bug'][$n]);
+    return oneof((isset($_POST['in']) && isset($_POST['in'][$n])) ?
+                    rinse($_POST['in'][$n]) : false,
+                 (isset($GLOBALS['bug']) && isset($GLOBALS['bug'][$n])) ?
+                    $GLOBALS['bug'][$n] : false);
 }
 
 /**
@@ -1194,7 +1196,7 @@
     $style['Open']     = ($status == 'Open')    ?' class="status_active"':'';
     $style['Feedback'] = ($status == 'Feedback')?' class="status_active"':'';
     $style['All']      = ($status == 'All')     ?' class="status_active"':'';
-
+    $style['CRSLR']    = ($status == 'CRSLR')   ?' class="status_active"':'';
     echo '<td style="text-align: right;">' . "\n Status: ";
     if (!$fulllink) {
         $fulllink = '/bugs/search.php?cmd=display&amp;' . $pkgs; 
@@ -1216,7 +1218,7 @@
             echo delim();
             echo make_link($fulllink .
                            '&amp;status=CRSLR', 'Fixed Since Version ' . 
-                           key($releases), $style['CRSLR'], 'Closed bugs since 
last release');
+                           key($releases), '', $style['CRSLR'], 'Closed bugs 
since last release');
         }
     }
     echo "\n</td></tr></table>\n";

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php