[php-blog-cvs] r719 - trunk/include
A reliable, secure & extensible PHP blog | Not mainstream since 2002
Brought to you by:
garvinhicking,
jhermanns
From: garvinhicking at B. <gar...@ma...> - 2005-11-21 10:58:10
|
Author: garvinhicking Date: 2005-11-21 11:58:03 +0100 (Mon, 21 Nov 2005) New Revision: 719 Modified: trunk/include/functions_entries.inc.php Log: new hook for deleting entries Modified: trunk/include/functions_entries.inc.php =================================================================== --- trunk/include/functions_entries.inc.php 2005-11-21 09:56:37 UTC (rev 718) +++ trunk/include/functions_entries.inc.php 2005-11-21 10:58:03 UTC (rev 719) @@ -4,11 +4,11 @@ function serendipity_deleteCategory($category_range, $admin_category) { global $serendipity; - + if (!serendipity_checkPermission('adminCategoriesDelete')) { return false; } - + serendipity_plugin_api::hook_event('backend_category_delete', $category_range); return serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE category_left BETWEEN {$category_range} {$admin_category}"); @@ -231,7 +231,7 @@ $group = 'GROUP BY e.id'; $distinct = ''; } - + serendipity_ACL_SQL($cond); // Store the unique query condition for entries for later reference, like getting the total article count. @@ -473,10 +473,10 @@ a.realname FROM {$serendipity['dbPrefix']}category AS c LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a - ON c.authorid = a.authorid + ON c.authorid = a.authorid LEFT OUTER JOIN {$serendipity['dbPrefix']}authorgroups AS ag ON ag.authorid = a.authorid - LEFT OUTER JOIN {$serendipity['dbPrefix']}access AS acl + LEFT OUTER JOIN {$serendipity['dbPrefix']}access AS acl ON (ag.groupid = acl.groupid AND acl.artifact_id = c.categoryid) $where $group"; @@ -708,7 +708,7 @@ } $authorData = array( - 'authorid' => $entry['authorid'], + 'authorid' => $entry['authorid'], 'username' => $entry['author'], 'email' => $entry['email'], 'realname' => $entry['author'] @@ -994,6 +994,7 @@ serendipity_purgeEntry($id, $result[0]); + serendipity_plugin_api::hook_event('backend_delete_entry', $id); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id"); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entrycat WHERE entryid=$id"); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entryproperties WHERE entryid=$id"); @@ -1125,7 +1126,7 @@ $s = serendipity_serverOffsetHour(mktime(0, 0, 0, $m, 1, $y), true); $e = serendipity_serverOffsetHour(mktime(23, 59, 59, $m, date('t', $s), $y), true); - $entries = serendipity_db_query("SELECT count(id) + $entries = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries e LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON e.id = ec.entryid @@ -1133,7 +1134,7 @@ ON ec.categoryid = c.categoryid WHERE isdraft = 'false' AND timestamp >= $s - AND timestamp <= $e " + AND timestamp <= $e " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : '') . (!empty($cat_sql) ? ' AND ' . $cat_sql : '') ); |