|
From: Garvin H. <gar...@us...> - 2004-10-07 10:32:20
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8588 Modified Files: Tag: branch-smarty serendipity_functions.inc.php serendipity_admin_comments.inc.php NEWS Log Message: MFH Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.27 retrieving revision 1.214.2.28 diff -u -d -r1.214.2.27 -r1.214.2.28 --- NEWS 6 Oct 2004 10:31:08 -0000 1.214.2.27 +++ NEWS 7 Oct 2004 10:32:04 -0000 1.214.2.28 @@ -29,6 +29,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Trackback moderation support in admin panel, make captcha plugin + only work for comments (garvinhicking) + * Bug #1037122: BlogPDF plugin will me less strict in file inclusion (garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.42 retrieving revision 1.419.2.43 diff -u -d -r1.419.2.42 -r1.419.2.43 --- serendipity_functions.inc.php 6 Oct 2004 23:02:03 -0000 1.419.2.42 +++ serendipity_functions.inc.php 7 Oct 2004 10:32:04 -0000 1.419.2.43 @@ -1373,6 +1373,7 @@ $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'"; $ca = serendipity_db_query($query, true); + $commentInfo['type'] = $type; serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) { $title = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : ''); Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.17.2.6 retrieving revision 1.17.2.7 diff -u -d -r1.17.2.6 -r1.17.2.7 --- serendipity_admin_comments.inc.php 5 Oct 2004 19:56:30 -0000 1.17.2.6 +++ serendipity_admin_comments.inc.php 7 Oct 2004 10:32:04 -0000 1.17.2.7 @@ -86,7 +86,9 @@ 'url' => $serendipity['POST']['url'], 'timestamp' => time() ) - ) + ), + false, + false ); } @@ -111,16 +113,25 @@ $searchString .= (!empty($serendipity['GET']['filter'][$filter]) ? "&serendipity[filter][". $filter ."]=". $serendipity['GET']['filter'][$filter] : ""); } -if ( $serendipity['GET']['filter']['show'] == 'approved' ) { - $and .= "AND status = 'approved'"; -} elseif ( $serendipity['GET']['filter']['show'] == 'pending' ) { - $and .= "AND status = 'pending'"; +if ($serendipity['GET']['filter']['show'] == 'approved') { + $and .= "AND status = 'approved'"; + $searchString .= "&serendipity[filter][show]=approved"; +} elseif ($serendipity['GET']['filter']['show'] == 'pending') { + $and .= "AND status = 'pending'"; + $searchString .= "&serendipity[filter][show]=pending"; } else { $serendipity['GET']['filter']['show'] = 'all'; } +if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') { + $c_type = 'TRACKBACK'; + $searchString .= "&serendipity[filter][type]=TRACKBACK"; +} else { + $c_type = 'NORMAL'; +} + /* Paging */ -$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true); +$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = '$c_type' ". $and, true); $totalComments = $sql['total']; $pages = ceil($totalComments/$commentsPerPage); @@ -144,7 +155,7 @@ $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage)); $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) - WHERE type = 'NORMAL' + WHERE type = '$c_type' ". $and ." " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . " ORDER BY id DESC $limit"); @@ -203,9 +214,17 @@ <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> <td><?php echo COMMENTS_FILTER_SHOW ?>:</td> <td><select name="serendipity[filter][show]"> - <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_ALL ?></option> - <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> - <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' SELECTED' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option> + <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option> + <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option> + </select></td> + </tr> + <tr> + <td colspan="4"> </td> + <td><?php echo TYPE; ?></td> + <td><select name="serendipity[filter][type]"> + <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option> + <option value="TRACKBACK"<?php if ($c_type == 'TRACKBACK') echo ' selected="selected"' ?>><?php echo TRACKBACKS; ?></option> </select></td> </tr> <tr> @@ -261,7 +280,7 @@ ?> <tr> <td><a name="c<?php echo $rs['id'] ?>"></a> - <?php echo '#'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> + <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?> </td> </tr> <tr> @@ -313,4 +332,4 @@ </tr> </table> </form> -<?php } ?> +<?php } ?> \ No newline at end of file |
