|
From: <ste...@us...> - 2003-03-31 22:12:33
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv2141
Modified Files:
serendipity_functions.inc.php
Log Message:
use weblogid where appropriate
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_functions.inc.php 31 Mar 2003 21:59:25 -0000 1.10
+++ serendipity_functions.inc.php 31 Mar 2003 22:12:26 -0000 1.11
@@ -87,7 +87,7 @@
$endts = mktime(0, 0, 0, $month + 1, 1, $year);
// Find out about diary entries
- $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts";
+ $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts and weblogid='$serendipity[weblogId]'";
$rows = serendipity_db_query($querystring);
$activeDays = array();
if (is_array($rows)) {
@@ -185,7 +185,9 @@
$startts = mktime(0, 0, 0, $month, $day, $year);
$endts = mktime(0, 0, 0, $month+1, 0, $year);
- $and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
+ $and = " WHERE timestamp >= $startts AND timestamp <= $endts AND ";
+ } else {
+ $and = " WHERE ";
}
if (!empty($limit)) {
@@ -195,7 +197,7 @@
$query = "SELECT e.*, a.username, c.category_name FROM
({$serendipity['dbPrefix']}entries AS e LEFT JOIN {$serendipity['dbPrefix']}category c ON e.categoryid = c.categoryid)
LEFT JOIN {$serendipity['dbPrefix']}authors a ON
- e.authorid = a.authorid " . $and .
+ e.authorid = a.authorid " . $and . "e.weblogid='$serendipity[weblogId]' " .
"ORDER BY timestamp DESC $limit";
$ret = serendipity_db_query($query);
if (is_string($ret)) {
@@ -213,7 +215,7 @@
if ($full === true) $body = ", body, extended";
$querystring = "SELECT * FROM ".$serendipity["dbPrefix"]."entries e, $serendipity[dbPrefix]authors a
- WHERE a.authorid = e.authorid AND $key LIKE $val LIMIT 1";
+ WHERE a.authorid = e.authorid AND $key LIKE $val and e.weblogid='$serendipity[weblogId] LIMIT 1";
return serendipity_db_query($querystring, true);
}
@@ -228,7 +230,7 @@
$authorid = $serendipity['authorid'];
}
- $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE authorid = $authorid";
+ $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE weblogid='$serendipity[weblogId]' and authorid = $authorid";
return serendipity_db_query($querystring);
}
@@ -241,7 +243,7 @@
global $serendipity;
$querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$serendipity["dbPrefix"]."entries
- WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
+ WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') AND weblogid='$serendipity[weblogId]' ORDER BY timestamp DESC";
return serendipity_db_query($querystring);
}
@@ -347,7 +349,7 @@
{
global $serendipity;
- $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id";
+ $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id and weblogid='$serendipity[weblogId]'";
if (isset($limit)) {
$query .= " LIMIT $limit";
}
@@ -408,7 +410,7 @@
$query = "SELECT email, title, mail_comments
FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
WHERE e.id = '$id'
- AND e.authorid = a.authorid";
+ AND e.authorid = a.authorid and e.weblogid='$serendipity[weblogId]";
$row = serendipity_db_query($query, true);
if($row['mail_comments']) {
serendipity_sendComment($row['email'], $name, $email, $url, $id,
@@ -444,7 +446,7 @@
{
global $serendipity;
- $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "'";
+ $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "' and weblogid='$serendipity[weblogId]'";
return serendipity_db_query($query);
}
@@ -780,7 +782,7 @@
$locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
}
$query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
- $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
+ $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "' and weblogid='$serendipity[weblogId]'";
$row = serendipity_db_query($query, true, 'num');
if ($row[0] > 0) {
@@ -790,7 +792,7 @@
serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text));
}
}
- serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid'");
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid' and weblogid='$serendipity[weblogId]'");
for ($i = 0; $i < $j; ++$i) {
$query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES(";
@@ -907,14 +909,14 @@
if (!is_numeric($id)) return false;
// Purge the daily/monthly entries so they can be rebuilt
- $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
+ $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id and weblogid='$serendipity[weblogId]'", true);
serendipity_purgeEntry($id, $result[0]);
- serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "entries WHERE id=$id");
+ serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "entries WHERE id=$id and weblogid=$serendipity[weblogId]");
- serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "comments WHERE entry_id=$id");
+ serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "comments WHERE entry_id=$id and weblogid=$serendipity[weblogId]");
- serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id' and weblogid=$serendipity[weblogId]");
}
function serendipity_updateCSS($css) {
@@ -1376,8 +1378,8 @@
FROM $serendipity[dbPrefix]suppress
WHERE ip = '$_SERVER[REMOTE_ADDR]'
AND url = '$_SERVER[HTTP_REFERER]'
- AND last > now() - 900";
- $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
+ AND last > now() - 900 and weblogid='$serendipity[weblogId]'";
+ $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
$suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
(url, ip, last)
VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
@@ -1404,7 +1406,7 @@
function serendipity_track_referrer_gc() {
global $serendipity;
- $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900";
+ $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900 and weblogid='$serendipity[weblogId]'";
serendipity_db_query($gc);
}
@@ -1420,6 +1422,7 @@
global $serendipity;
$query = "SELECT url, sum(count) AS total
FROM $serendipity[dbPrefix]$list
+ WHERE weblogid='$serendipity[weblogId]'
GROUP BY url
ORDER BY total desc
LIMIT $limit";
@@ -1439,7 +1442,7 @@
function serendipity_set_config_var($name, $val) {
global $serendipity;
- serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
+ serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "' and weblogid='$serendipity[weblogId]'");
$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>$serendipity[weblogId]));
if (is_string($r)) {
echo $r;
@@ -1449,7 +1452,7 @@
function serendipity_get_config_var($name, $defval = false) {
global $serendipity;
$name = serendipity_db_escape_string($name);
- $c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name'", true);
+ $c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name' and weblogid='$serendipity[weblogId]'", true);
if (is_array($c)) {
return $c[0];
}
@@ -1461,7 +1464,7 @@
$names = array();
- $query = "SELECT cssid, name from $serendipity[dbPrefix]css order by name";
+ $query = "SELECT cssid, name from $serendipity[dbPrefix]css where weblogid=$serendipity[weblogId] order by name";
$rows = serendipity_db_query($query);
foreach ($rows as $row) {
$names[$row['cssid']] = $row['name'];
@@ -1474,12 +1477,12 @@
global $serendipity;
if (is_numeric($name)) {
- $query = "select * from $serendipity[dbPrefix]css where cssid = '$name'";
+ $query = "select * from $serendipity[dbPrefix]css where cssid = '$name' and weblogid='$serendipity[weblogId]'";
} else {
if ($name === null) {
$name = serendipity_get_config_var("default_css", "default");
}
- $query = "select * from $serendipity[dbPrefix]css where name = '$name'";
+ $query = "select * from $serendipity[dbPrefix]css where name = '$name' and weblogid='$serendipity[weblogId]'";
}
$qh = serendipity_db_query($query, true);
@@ -1533,7 +1536,7 @@
global $serendipity;
$s = mktime(0,0,0, $month, 1, $year);
$e = mktime(23,59,59, $month, date("t",$s) , $year);
- $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE timestamp>$s AND timestamp<$e";
+ $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE weblogid='$serendipity[weblogId]' and timestamp>$s AND timestamp<$e";
$query = serendipity_db_query($querystring);
return $query[0][0];
}
@@ -1545,7 +1548,7 @@
global $serendipity;
echo "<div class='serendipity_title'>The Archive:</div>";
- $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
+ $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries where weblogid='$serendipity[weblogId]' ORDER BY timestamp ASC LIMIT 1");
$lastYear = date("Y", $f[0][0]);
$lastMonth= date("m", $f[0]);
$currYear = date("Y");
|
