cvs: pearweb /public_html/notes/admin index.php trans.php /templates/notes note-manage-admin.tpl.php

wiesemann Fri May 11 20:54:16 2007 UTC

Modified files:
/pearweb/public_html/notes/admin index.php trans.php
/pearweb/templates/notes note-manage-admin.tpl.php
Log:
- improve template:
* let the user see which notes he sees (approved, pending, deleted)
* add manual url to be able to get back to the manual
- fix notes admin:
* don't let the error message get lost in index.php
* associate the "buggy" note to the package if possible
* add the manual id to the bug, otherwise the comment might be ambiguous
* change "method order" in 'makeDocBug' case: this can never have worked
the old way (=> please test before you commit)
* don't show a blank page after transforming to a bug
* remove some notices and improve handling if no note is selected


http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/public_html/notes/admin/index.php
diff -u pearweb/public_html/notes/admin/index.php:1.9 pearweb/public_html/notes/admin/index.php:1.10
--- pearweb/public_html/notes/admin/index.php:1.9 Fri Apr 27 08:21:07 2007
+++ pearweb/public_html/notes/admin/index.php Fri May 11 20:54:15 2007
@@ -25,7 +25,7 @@
} elseif (isset($_GET['status']) && $_GET['status'] == 'deleted') {
$status = 'no';
$action = 'approveMass';
- $title = 'Deleted notes.';
+ $title = 'Deleted notes';
$button = 'Un-Delete comments';
$caption = 'Deleted';
$name = 'delete';
@@ -38,5 +38,7 @@
}

$url = isset($_GET['url']) ? strip_tags($_GET['url']) : '';
-$error = '';
+if (!isset($error)) {
+ $error = '';
+}
require dirname(dirname(dirname(dirname(__FILE__)))) . '/templates/notes/note-manage-admin.tpl.php';
http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/public_html/notes/admin/trans.php
diff -u pearweb/public_html/notes/admin/trans.php:1.9 pearweb/public_html/notes/admin/trans.php:1.10
--- pearweb/public_html/notes/admin/trans.php:1.9 Fri Apr 27 08:21:07 2007
+++ pearweb/public_html/notes/admin/trans.php Fri May 11 20:54:15 2007
@@ -17,14 +17,16 @@
$noteId = (int)$_GET['noteId'];

$note = $manualNotes->getSingleCommentById($noteId);
-
+
$registered = 1;
- $package_name = 'Documentation';
+ $package = getPackageNameForId($note['page_url']);
+ $package_name = is_null($package) ? 'Documentation' : $package;
$bug_type = 'Documentation Problem';
$email = $auth_user->email;
$handle = $auth_user->handle;
$sdesc = 'User note that is a documentation problem';
- $ldesc = str_replace('<br />', '', $note['note_text']);
+ $ldesc = 'Manual page: ' . $note['page_url'] . "\n\n" .
+ str_replace('<br />', '', $note['note_text']);
$package_version = null;
$php_version = 'Irrelevant';
$php_os = 'Irrelevant';
@@ -55,14 +57,17 @@
)
";

- /**
- * Hrmph...
- */
+ $dbh->query($sql);
+ // TODO: add error handling
+
if ($dbh->phptype == 'mysql') {
$id = mysql_insert_id();
} else {
$id = mysqli_insert_id($dbh->connection);
}
+
+ $manualNotes->deleteSingleComment($noteId);
+ // TODO: add error handling

$emailInfos = array(
'id' => $id,
@@ -74,14 +79,13 @@
'ldesc' => $ldesc,
'sdesc' => $sdesc,
);
-
- $dbh->query($sql);

- $manualNotes->deleteSingleComment($noteId);
-
require dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'include/bugs/pear-bug-accountrequest.php';
$pba = new PEAR_Bug_AccountRequest;
$pba->sendBugEmail($emailInfos);
+
+ include dirname(__FILE__) . '/index.php';
+ exit;
}
break;
case 'updateapproved':
@@ -99,12 +103,19 @@
$error = 'Error while making the note pending, contact webmaster';
} else {
$message = 'Comment(s) successfully ';
- $message .= isset($_POST['pending']) ? 'pending' : 'deleted';
+ $message .= isset($_POST['pending']) ? 'made pending' : 'deleted';
}
$_GET = $_POST;

include dirname(__FILE__) . '/index.php';
exit;
+ } else {
+ $error = 'Neither pending nor delete was selected';
+ $_GET = $_POST;
+ $_GET['status'] = 'approved';
+
+ include dirname(__FILE__) . '/index.php';
+ exit;
}

if (isset($_POST['url']) && !empty($_POST['url'])) {
@@ -138,6 +149,15 @@

include dirname(__FILE__) . '/index.php';
exit;
+ } else {
+ $error = 'Neither delete nor approve was selected';
+ $_GET = $_POST;
+ if (isset($_POST['delete'])) {
+ $_GET['status'] = 'deleted';
+ }
+
+ include dirname(__FILE__) . '/index.php';
+ exit;
}

if (isset($_POST['url']) && !empty($_POST['url'])) {
@@ -158,3 +178,15 @@
response_footer();
exit;
}
+
+function getPackageNameForId($id)
+{
+ global $dbh;
+ $res = preg_match('/^package\.[\w-]+\.([\w-]+).*\.php$/', $id, $matches);
+ if ($res === 0) {
+ return null;
+ }
+ $package = str_replace('-', '_', $matches[1]);
+ $query = 'SELECT name FROM packages WHERE LCASE(name) = LCASE(?)';
+ return $dbh->getOne($query, $package);
+}
http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/templates/notes/note-manage-admin.tpl.php
diff -u pearweb/templates/notes/note-manage-admin.tpl.php:1.24 pearweb/templates/notes/note-manage-admin.tpl.php:1.25
--- pearweb/templates/notes/note-manage-admin.tpl.php:1.24 Fri Apr 27 08:21:41 2007
+++ pearweb/templates/notes/note-manage-admin.tpl.php Fri May 11 20:54:15 2007
@@ -22,6 +22,7 @@
</style>

<h1>Notes Management Area</h1>
+<h3><?php echo $title; ?></h3>
<?php include dirname(dirname(dirname(__FILE__))) . '/templates/notes/note-manage-links.tpl.php'; ?>
<?php if (strlen(trim($error)) > 0): // {{{ error ?>
<div class="errors"><?php echo $error; ?></div>
@@ -55,7 +56,7 @@
<input type="checkbox" name="noteIds[]" value="<?php echo $pendingComment['note_id']; ?>" />
<br />
<input class="makeDocBug" type="button"
- value="Transform into a Doc Bug" onclick="document.location.href='/notes/admin/trans.php?action=makeDocBug&noteId=<?php echo $pendingComment['note_id']; ?>'"/>
+ value="Transform into a Doc Bug" onclick="document.location.href='/notes/admin/trans.php?action=makeDocBug&noteId=<?php echo $pendingComment['note_id']; ?>&url=<?php echo $pendingComment['page_url']; ?>'"/>
</th>
<td class="form-input">
<a href="/manual/en/<?php echo $pendingComment['page_url'] ?>"><?php