Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv2875
Modified Files:
db.sql serendipity_admin_installer.inc.php
serendipity_config.inc.php serendipity_config_local.tpl
serendipity_functions.inc.php
Log Message:
remove weblogid from schemas, apologies to all who upgraded: sorry!
default is 0 for false
Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db.sql 31 Mar 2003 22:17:11 -0000 1.5
+++ db.sql 2 Apr 2003 21:02:04 -0000 1.6
@@ -2,16 +2,6 @@
# Table structure for table '{PREFIX}authors'
#
-create table {PREFIX}weblogs (
- weblogid {AUTOINCREMENT}
-);
-
-create table {PREFIX}perms (
- weblogid int(11) not null,
- userid int(11) not null,
- permid int(4) not null
-);
-
create table {PREFIX}authors (
username varchar(20) default null,
password varchar(32) default null,
@@ -28,7 +18,6 @@
create table {PREFIX}comments (
id {AUTOINCREMENT},
entry_id int(10) {UNSIGNED} not null default '0',
- weblogid int(11) not null,
timestamp int(10) {UNSIGNED} default null,
title varchar(150) default null,
author varchar(80) default null,
@@ -55,8 +44,7 @@
exflag int(1) default null,
author varchar(20) default null,
authorid int(11) default null,
- categoryid int(11) default null,
- weblogid int(11) not null
+ categoryid int(11) default null
);
CREATE FULLTEXT INDEX entry on {PREFIX}entries (title,body,extended);
@@ -69,8 +57,7 @@
id {AUTOINCREMENT},
entry_id int(10) {UNSIGNED} not null default '0',
link text,
- name text,
- weblogid int(11) not null
+ name text
);
#
@@ -92,7 +79,6 @@
url varchar(128) NOT NULL default '',
day date NOT NULL,
count int(11) NOT NULL default '0',
- weblogid int(11) not null,
PRIMARY KEY (url,day)
);
@@ -103,21 +89,18 @@
CREATE TABLE {PREFIX}css (
cssid {AUTOINCREMENT},
name varchar(40) default NULL,
- data text,
- weblogid int(11) not null
+ data text
);
create table {PREFIX}config (
name varchar(255) not null primary key,
- value text not null,
- weblogid int(11) not null
+ value text not null
);
CREATE TABLE {PREFIX}suppress (
url varchar(128) default NULL,
ip varchar(15) default NULL,
- last timestamp NOT NULL,
- weblogid int(11) not null
+ last timestamp NOT NULL
);
CREATE unique INDEX url on {PREFIX}suppress (url, ip);
@@ -133,6 +116,5 @@
categoryid {AUTOINCREMENT},
category_name varchar(255) default NULL,
category_description text,
- authorid int(11) default NULL,
- weblogid int(11) not null
+ authorid int(11) default NULL
);
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_installer.inc.php 31 Mar 2003 21:59:25 -0000 1.5
+++ serendipity_admin_installer.inc.php 2 Apr 2003 21:02:05 -0000 1.6
@@ -120,7 +120,6 @@
$fp = fopen($filename, 'r');
while (!@feof($fp)) {
$line = trim(fgets($fp));
- var_dump($line);
if ($in_table) {
$def .= $line;
if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
@@ -236,7 +235,7 @@
serendipity_db_query($query);
$text = serendipity_db_escape_string(file_get_contents('./serendipity.css'));
- $query = "INSERT into $_POST[dbPrefix]css (name, data, weblogid) values ('default', '$text', '1')";
+ $query = "INSERT into $_POST[dbPrefix]css (name, data) values ('default', '$text')";
$res = serendipity_db_query($query);
if (is_string($res)) {
echo $res;
@@ -246,9 +245,9 @@
$p = serendipity_parseTemplate("./serendipity_config_local.tpl");
foreach($p as $key=>$value) {
foreach ($value as $entry) {
- $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value, weblogid) ";
+ $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value) ";
$query .= "VALUES ('" . serendipity_db_escape_string($entry['name']) . "', '";
- $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "', '1');";
+ $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "');";
serendipity_db_query($query);
}
@@ -273,7 +272,6 @@
fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
- fwrite($configfp, "\$serendipity['weblogId'] = '1';\n");
fwrite($configfp, "?>\n");
fclose($configfp);
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_config.inc.php 31 Mar 2003 21:49:26 -0000 1.3
+++ serendipity_config.inc.php 2 Apr 2003 21:02:06 -0000 1.4
@@ -29,7 +29,7 @@
);
// Load Configuration options from the database
-$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config WHERE weblogid='1'");
+$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config");
foreach ($rows as $row) {
$serendipity[$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
}
Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_config_local.tpl 1 Apr 2003 06:30:31 -0000 1.2
+++ serendipity_config_local.tpl 2 Apr 2003 21:02:06 -0000 1.3
@@ -24,7 +24,7 @@
$serendipity["email"] = "{email|string|j}"; // Email for admin login
$serendipity["want_mail"] = {want_mail|bool|true}; // Do you want to receive emails when comments are posted to your serendipity?
$serendipity["extCSS"] = "{extCSS|string|none}"; // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity["wysiwyg"] = {wysiwyg|bool|false}; // Do you want to use the WYSIWYG editor?
+$serendipity["wysiwyg"] = {wysiwyg|bool|0}; // Do you want to use the WYSIWYG editor?
$serendipity["layout_mode"] = "{layout_mode|string|table}"; // Layout mode
$serendipity["blogTitle"] = "{blogTitle|string|Foo Bar}"; // Site title
@@ -38,5 +38,5 @@
$serendipity["thumbSuffix"] = "{thumbSuffix|string|serendipityThumb}"; // Thumbnails will be named original.Suffix.ext
$serendipity["thumbSize"] = "{thumbSize|int|110}"; // Maximum dimension of thumbnails
-$serendipity["track_exits"] = {track_exits|bool|false}; // Do you want to track exit targets?
+$serendipity["track_exits"] = {track_exits|bool|0}; // Do you want to track exit targets?
?>
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_functions.inc.php 2 Apr 2003 11:16:51 -0000 1.19
+++ serendipity_functions.inc.php 2 Apr 2003 21:02:07 -0000 1.20
@@ -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 and weblogid='$serendipity[weblogId]'";
+ $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts";
$rows = serendipity_db_query($querystring);
$activeDays = array();
if (is_array($rows)) {
@@ -185,9 +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 ";
+ $and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
} else {
- $and = " WHERE ";
+ $and = "";
}
if (!empty($limit)) {
@@ -197,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.weblogid='$serendipity[weblogId]' " .
+ e.authorid = a.authorid " . $and .
"ORDER BY timestamp DESC $limit";
$ret = serendipity_db_query($query);
if (is_string($ret)) {
@@ -215,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 and e.weblogid='$serendipity[weblogId]' LIMIT 1";
+ WHERE a.authorid = e.authorid AND $key LIKE $val LIMIT 1";
return serendipity_db_query($querystring, true);
}
@@ -230,7 +230,7 @@
$authorid = $serendipity['authorid'];
}
- $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE weblogid='$serendipity[weblogId]' and authorid = $authorid";
+ $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE authorid = $authorid";
return serendipity_db_query($querystring);
}
@@ -243,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)."') AND weblogid='$serendipity[weblogId]' ORDER BY timestamp DESC";
+ WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
return serendipity_db_query($querystring);
}
@@ -349,7 +349,7 @@
{
global $serendipity;
- $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id and weblogid='$serendipity[weblogId]'";
+ $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id";
if (isset($limit)) {
$query .= " LIMIT $limit";
}
@@ -410,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.weblogid='$serendipity[weblogId]";
+ AND e.authorid = a.authorid";
$row = serendipity_db_query($query, true);
if($row['mail_comments']) {
serendipity_sendComment($row['email'], $name, $email, $url, $id,
@@ -446,7 +446,7 @@
{
global $serendipity;
- $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "' and weblogid='$serendipity[weblogId]'";
+ $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "'";
return serendipity_db_query($query);
}
@@ -809,7 +809,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]) . "' and weblogid='$serendipity[weblogId]'";
+ $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
$row = serendipity_db_query($query, true, 'num');
if ($row[0] > 0) {
@@ -819,7 +819,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' and weblogid='$serendipity[weblogId]'");
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid'");
for ($i = 0; $i < $j; ++$i) {
$query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES(";
@@ -860,7 +860,6 @@
$entry['exflag'] = $exflag;
$entry['author'] = $serendipity['user'];
$entry['authorid'] = $serendipity['authorid'];
- $entry['weblogid'] = $serendipity['weblogId'];
if (!is_numeric($entry["id"])) {
/* we need to insert */
@@ -936,14 +935,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 and weblogid='$serendipity[weblogId]'", true);
+ $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
serendipity_purgeEntry($id, $result[0]);
- serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "entries WHERE id=$id and weblogid=$serendipity[weblogId]");
+ serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"]. "entries WHERE 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"]. "comments WHERE entry_id=$id");
- serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id' and weblogid=$serendipity[weblogId]");
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
}
function serendipity_updateCSS($css) {
@@ -954,13 +953,12 @@
if ($css["cssid"] == 0) {
- $css['weblogid'] = $serendipity['weblogId'];
unset($css['cssid']);
$res = serendipity_db_insert('css', $css);
$newEntry = 1;
$css['cssid'] = serendipity_db_insert_id();
} else {
- $res = serendipity_db_update('css', array('cssid' => $css['cssid'], 'weblogid' => $serendipity['weblogId']), $css);
+ $res = serendipity_db_update('css', array('cssid' => $css['cssid']), $css);
}
if (is_string($res)) {
@@ -1406,9 +1404,9 @@
FROM $serendipity[dbPrefix]suppress
WHERE ip = '$_SERVER[REMOTE_ADDR]'
AND url = '$_SERVER[HTTP_REFERER]'
- AND last > now() - 900 and weblogid='$serendipity[weblogId]'";
+ AND last > now() - 900";
- $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
+ $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
$suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
(url, ip, last)
VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
@@ -1429,7 +1427,7 @@
function serendipity_track_referrer_gc() {
global $serendipity;
- $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900 and weblogid='$serendipity[weblogId]'";
+ $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900";
serendipity_db_query($gc);
}
@@ -1444,13 +1442,11 @@
sprintf(
"UPDATE %s%s
SET count = count + 1
- WHERE weblogid = %d
- AND url = '%s'
+ WHERE url = '%s'
AND day = NOW()",
$serendipity['dbPrefix'],
$list,
- $serendipity['weblogId'],
$url
)
);
@@ -1459,12 +1455,11 @@
serendipity_db_query(
sprintf(
"INSERT INTO %s%s
- (weblogid, url, day, count)
- VALUES (%d, '%s', NOW(), 1)",
+ (url, day, count)
+ VALUES ('%s', NOW(), 1)",
$serendipity['dbPrefix'],
$list,
- $serendipity['weblogId'],
$url
)
);
@@ -1483,7 +1478,6 @@
global $serendipity;
$query = "SELECT url, SUM(count) AS total
FROM $serendipity[dbPrefix]$list
- WHERE weblogid='$serendipity[weblogId]'
GROUP BY url
ORDER BY total DESC, url
LIMIT $limit";
@@ -1503,8 +1497,8 @@
function serendipity_set_config_var($name, $val) {
global $serendipity;
- 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]));
+ serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
+ $r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val));
if (is_string($r)) {
echo $r;
}
@@ -1513,7 +1507,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' and weblogid='$serendipity[weblogId]'", true);
+ $c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name'", true);
if (is_array($c)) {
return $c[0];
}
@@ -1525,7 +1519,7 @@
$names = array();
- $query = "SELECT cssid, name from $serendipity[dbPrefix]css where weblogid=$serendipity[weblogId] order by name";
+ $query = "SELECT cssid, name from $serendipity[dbPrefix]css where order by name";
$rows = serendipity_db_query($query);
foreach ($rows as $row) {
$names[$row['cssid']] = $row['name'];
@@ -1538,12 +1532,12 @@
global $serendipity;
if (is_numeric($name)) {
- $query = "select * from $serendipity[dbPrefix]css where cssid = '$name' and weblogid='$serendipity[weblogId]'";
+ $query = "select * from $serendipity[dbPrefix]css where cssid = '$name'";
} else {
if ($name === null) {
$name = serendipity_get_config_var("default_css", "default");
}
- $query = "select * from $serendipity[dbPrefix]css where name = '$name' and weblogid='$serendipity[weblogId]'";
+ $query = "select * from $serendipity[dbPrefix]css where name = '$name'";
}
$qh = serendipity_db_query($query, true);
@@ -1597,7 +1591,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 weblogid='$serendipity[weblogId]' and timestamp>$s AND timestamp<$e";
+ $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE timestamp>$s AND timestamp<$e";
$query = serendipity_db_query($querystring);
return $query[0][0];
}
@@ -1609,7 +1603,7 @@
global $serendipity;
echo "<div class='serendipity_title'>The Archive:</div>";
- $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries where weblogid='$serendipity[weblogId]' ORDER BY timestamp ASC LIMIT 1");
+ $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
$lastYear = date("Y", $f[0][0]);
$lastMonth= date("m", $f[0]);
$currYear = date("Y");
|
