Menu
▾
▴
tavi-cvs-commit — CVS commit changelogs should be forwarded to this list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(107) |
Feb
(48) |
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
(29) |
Jul
(14) |
Aug
(9) |
Sep
(34) |
Oct
(14) |
Nov
(6) |
Dec
(18) |
| 2004 |
Jan
|
Feb
(4) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(43) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Scott M. <sm...@us...> - 2002-02-22 14:46:14
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11105/lib
Modified Files:
category.php defaults.php init.php main.php pagestore.php
Log Message:
Merge 0.21 bugfixes into trunk.
Index: category.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/category.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- category.php 4 Jan 2002 20:38:42 -0000 1.6
+++ category.php 22 Feb 2002 14:46:08 -0000 1.7
@@ -42,6 +42,7 @@
$pg->text = str_replace("'", "\\'", $pg->text);
$pg->version++;
+ $pg->comment = '';
$pg->hostname = gethostbyaddr($REMOTE_ADDR);
$pg->username = $UserName;
Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- defaults.php 10 Jan 2002 17:56:19 -0000 1.4
+++ defaults.php 22 Feb 2002 14:46:08 -0000 1.5
@@ -27,7 +27,7 @@
// Note that changing this requires a change to parse/transforms.php so
// that parse_hyperlinkxxx know how many parentheses are included in $UrlPtn.
$UrlPtn = "(http:|mailto:|https:|ftp:|gopher:|news:)" .
- "([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~]";
+ "([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
// $InterWikiPtn establishes the format for InterWiki links in this wiki.
// Note that changing this requires a change to parse/transforms.php so
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- init.php 3 Jan 2002 21:46:23 -0000 1.8
+++ init.php 22 Feb 2002 14:46:08 -0000 1.9
@@ -36,7 +36,8 @@
// Read user preferences from cookie.
-$prefstr = $HTTP_COOKIE_VARS[$CookieName];
+$prefstr = isset($HTTP_COOKIE_VARS[$CookieName])
+ ? $HTTP_COOKIE_VARS[$CookieName] : '';
if(!empty($prefstr))
{
Index: main.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.php 8 Jan 2002 17:31:01 -0000 1.2
+++ main.php 22 Feb 2002 14:46:08 -0000 1.3
@@ -1,40 +1,71 @@
<?php
// $Id$
-// If register_globals is off, we need to harvest the script parameters
-// at this point.
+// Harvest script parameters and other variables. We do this even if
+// register_globals=on; this way, we force the variables to be defined.
+// (Which is better form in case the admin has warnings cranked all the
+// way up).
-if(!ini_get('register_globals'))
-{
- $HTTP_REFERER = $HTTP_SERVER_VARS['HTTP_REFERER'];
- $QUERY_STRING = $HTTP_SERVER_VARS['QUERY_STRING'];
- $REMOTE_ADDR = $HTTP_SERVER_VARS['REMOTE_ADDR'];
+$HTTP_REFERER = isset($HTTP_SERVER_VARS['HTTP_REFERER'])
+ ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '';
+$QUERY_STRING = isset($HTTP_SERVER_VARS['QUERY_STRING'])
+ ? $HTTP_SERVER_VARS['QUERY_STRING'] : '';
+$REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
+ ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
- $action = $HTTP_GET_VARS['action'];
- $page = $HTTP_GET_VARS['page'];
- $ver1 = $HTTP_GET_VARS['ver1'];
- $ver2 = $HTTP_GET_VARS['ver2'];
- $find = $HTTP_GET_VARS['find'];
- $version = $HTTP_GET_VARS['version'];
- $full = $HTTP_GET_VARS['full'];
+$action = isset($HTTP_GET_VARS['action'])
+ ? $HTTP_GET_VARS['action'] : '';
+$page = isset($HTTP_GET_VARS['page'])
+ ? $HTTP_GET_VARS['page'] : '';
+$ver1 = isset($HTTP_GET_VARS['ver1'])
+ ? $HTTP_GET_VARS['ver1'] : '';
+$ver2 = isset($HTTP_GET_VARS['ver2'])
+ ? $HTTP_GET_VARS['ver2'] : '';
+$find = isset($HTTP_GET_VARS['find'])
+ ? $HTTP_GET_VARS['find'] : '';
+$version = isset($HTTP_GET_VARS['version'])
+ ? $HTTP_GET_VARS['version'] : '';
+$full = isset($HTTP_GET_VARS['full'])
+ ? $HTTP_GET_VARS['full'] : '';
+$min = isset($HTTP_GET_VARS['min'])
+ ? $HTTP_GET_VARS['min'] : '';
+$days = isset($HTTP_GET_VARS['days'])
+ ? $HTTP_GET_VARS['days'] : '';
- $Preview = $HTTP_POST_VARS['Preview'];
- $Save = $HTTP_POST_VARS['Save'];
- $archive = $HTTP_POST_VARS['archive'];
- $auth = $HTTP_POST_VARS['auth'];
- $categories = $HTTP_POST_VARS['categories'];
- $cols = $HTTP_POST_VARS['cols'];
- $comment = $HTTP_POST_VARS['comment'];
- $days = $HTTP_POST_VARS['days'];
- $discard = $HTTP_POST_VARS['discard'];
- $document = $HTTP_POST_VARS['document'];
- $hist = $HTTP_POST_VARS['hist'];
- $min = $HTTP_POST_VARS['min'];
- $nextver = $HTTP_POST_VARS['nextver'];
- $rows = $HTTP_POST_VARS['rows'];
- $tzoff = $HTTP_POST_VARS['tzoff'];
- $user = $HTTP_POST_VARS['user'];
-}
+$Preview = isset($HTTP_POST_VARS['Preview'])
+ ? $HTTP_POST_VARS['Preview'] : '';
+$Save = isset($HTTP_POST_VARS['Save'])
+ ? $HTTP_POST_VARS['Save'] : '';
+$archive = isset($HTTP_POST_VARS['archive'])
+ ? $HTTP_POST_VARS['archive'] : '';
+$auth = isset($HTTP_POST_VARS['auth'])
+ ? $HTTP_POST_VARS['auth'] : '';
+$categories = isset($HTTP_POST_VARS['categories'])
+ ? $HTTP_POST_VARS['categories'] : '';
+$cols = isset($HTTP_POST_VARS['cols'])
+ ? $HTTP_POST_VARS['cols'] : '';
+$comment = isset($HTTP_POST_VARS['comment'])
+ ? $HTTP_POST_VARS['comment'] : '';
+$days = isset($HTTP_POST_VARS['days'])
+ ? $HTTP_POST_VARS['days'] : $days;
+$discard = isset($HTTP_POST_VARS['discard'])
+ ? $HTTP_POST_VARS['discard'] : '';
+$document = isset($HTTP_POST_VARS['document'])
+ ? $HTTP_POST_VARS['document'] : '';
+$hist = isset($HTTP_POST_VARS['hist'])
+ ? $HTTP_POST_VARS['hist'] : '';
+$min = isset($HTTP_POST_VARS['min'])
+ ? $HTTP_POST_VARS['min'] : $min;
+$nextver = isset($HTTP_POST_VARS['nextver'])
+ ? $HTTP_POST_VARS['nextver'] : '';
+$rows = isset($HTTP_POST_VARS['rows'])
+ ? $HTTP_POST_VARS['rows'] : '';
+$tzoff = isset($HTTP_POST_VARS['tzoff'])
+ ? $HTTP_POST_VARS['tzoff'] : '';
+$user = isset($HTTP_POST_VARS['user'])
+ ? $HTTP_POST_VARS['user'] : '';
+$referrer = isset($HTTP_POST_VARS['referrer'])
+ ? $HTTP_POST_VARS['referrer'] : '';
require('lib/init.php');
require('parse/transforms.php');
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pagestore.php 14 Dec 2001 20:48:08 -0000 1.4
+++ pagestore.php 22 Feb 2002 14:46:08 -0000 1.5
@@ -28,20 +28,19 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, max(version) FROM $PgTbl " .
- "GROUP BY title ORDER BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.body, t1.version, " .
+ "MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version) " .
+ "AND (body LIKE '%$text%' OR title LIKE '%$text%')");
+
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $q2 = $this->dbh->query("SELECT title FROM $PgTbl " .
- "WHERE title='$result[0]' " .
- "AND version='$result[1]' " .
- "AND (body LIKE '%$text%' " .
- "OR title LIKE '%$text%')");
-
- if($this->dbh->result($q2))
- { $list[] = $result[0]; }
+ $list[] = $result[0];
}
return $list;
@@ -52,6 +51,7 @@
{
global $PgTbl;
+ $page = addslashes($page);
$qid = $this->dbh->query("SELECT time, author, version, username, " .
"comment " .
"FROM $PgTbl WHERE title='$page' " .
@@ -72,6 +72,7 @@
{
global $IwTbl;
+ $name = addslashes($name);
$qid = $this->dbh->query("SELECT url FROM $IwTbl WHERE prefix='$name'");
if(($result = $this->dbh->result($qid)))
{ return $result[0]; }
@@ -83,6 +84,7 @@
{
global $LkTbl;
+ $page = addslashes($page);
$this->dbh->query("DELETE FROM $LkTbl WHERE page='$page'");
}
@@ -91,6 +93,7 @@
{
global $IwTbl;
+ $page = addslashes($page);
$this->dbh->query("DELETE FROM $IwTbl WHERE where_defined='$page'");
}
@@ -99,6 +102,7 @@
{
global $SwTbl;
+ $page = addslashes($page);
$this->dbh->query("DELETE FROM $SwTbl WHERE where_defined='$page'");
}
@@ -112,6 +116,9 @@
global $LkTbl;
static $links = array();
+ $page = addslashes($page);
+ $link = addslashes($link);
+
if(empty($links[$link]))
{
$this->dbh->query("INSERT INTO $LkTbl VALUES('$page', '$link', 1)");
@@ -133,6 +140,8 @@
$url = str_replace("'", "\\'", $url);
$url = str_replace("&", "&", $url);
+ $where_defined = addslashes($where_defined);
+
$qid = $this->dbh->query("SELECT where_defined FROM $IwTbl " .
"WHERE prefix='$prefix'");
if($this->dbh->result($qid))
@@ -155,6 +164,8 @@
$url = str_replace("'", "\\'", $url);
$url = str_replace("&", "&", $url);
+ $where_defined = addslashes($where_defined);
+
$qid = $this->dbh->query("SELECT where_defined FROM $SwTbl " .
"WHERE prefix='$prefix'");
if($this->dbh->result($qid))
@@ -172,9 +183,10 @@
// Find all twins of a page at sisterwiki sites.
function twinpages($page)
{
- global $RemTbl, $IwTbl;
+ global $RemTbl;
$list = array();
+ $page = addslashes($page);
$q2 = $this->dbh->query("SELECT site, page FROM $RemTbl " .
"WHERE page LIKE '$page'");
while(($twin = $this->dbh->result($q2)))
@@ -203,21 +215,19 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
- "GROUP BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.version, t1.author, t1.time, " .
+ "t1.username, LENGTH(t1.body), t1.comment, " .
+ "t1.mutable, MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version)");
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $q2 = $this->dbh->query("SELECT author, time, username, LENGTH(body), " .
- "comment, mutable " .
- "FROM $PgTbl " .
- "WHERE title='$result[0]' " .
- "AND version='$result[1]'");
- $auth_res = $this->dbh->result($q2);
-
- $list[] = array($auth_res[1], $result[0], $auth_res[0], $auth_res[2],
- $auth_res[3], $auth_res[4], $auth_res[5] == 'on', $result[1]);
+ $list[] = array($result[3], $result[0], $result[2], $result[4],
+ $result[5], $result[6], $result[7] == 'on', $result[1]);
}
return $list;
@@ -247,22 +257,20 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
- "GROUP BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.version, t1.author, " .
+ "t1.time, t1.username, t1.comment, t1.body, " .
+ "MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version) " .
+ "AND t1.body=''");
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $q2 = $this->dbh->query("SELECT author, time, username, comment " .
- "FROM $PgTbl " .
- "WHERE title='$result[0]' " .
- "AND version='$result[1]' " .
- "AND body=''");
- if(($auth_res = $this->dbh->result($q2)))
- {
- $list[] = array($auth_res[1], $result[0], $auth_res[0],
- $auth_res[2], 0, $auth_res[3]);
- }
+ $list[] = array($result[3], $result[0], $result[2],
+ $result[4], 0, $result[5]);
}
return $list;
@@ -276,8 +284,9 @@
$list = array();
foreach($names as $page)
{
+ $esc_page = addslashes($page);
$qid = $this->dbh->query("SELECT time, author, username, LENGTH(body), " .
- "comment FROM $PgTbl WHERE title='$page' " .
+ "comment FROM $PgTbl WHERE title='$esc_page' " .
"ORDER BY version DESC");
if(!($result = $this->dbh->result($qid)))
@@ -300,6 +309,7 @@
while(($result = $this->dbh->result($qid)))
{
+ $result[0] = addslashes($result[0]);
$this->dbh->query("DELETE FROM $PgTbl WHERE title='$result[0]' AND " .
"(version < $result[1] OR body='') AND " .
"TO_DAYS(NOW()) - TO_DAYS(supercede) > $ExpireLen");
|
|
From: Scott M. <sm...@us...> - 2002-02-22 14:46:13
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv11105/install
Modified Files:
configure.pl
Log Message:
Merge 0.21 bugfixes into trunk.
Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.pl 8 Jan 2002 20:36:44 -0000 1.7
+++ configure.pl 22 Feb 2002 14:46:08 -0000 1.8
@@ -51,7 +51,9 @@
{
print 'Enter value: ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
+ $value =~ s/\\/\\\\/g;
+ $value =~ s/'/\\'/g;
$value = "'" . $value . "'";
}
elsif($descriptor =~ /^boolean/)
@@ -60,7 +62,7 @@
{
print 'Enter setting (y/N): ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
if($value =~ /[Yy]/) # Value is on.
{ $value = 1; }
else
@@ -70,7 +72,7 @@
{
print 'Enter setting (Y/n): ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
if($value =~ /[Nn]/) # Value is off.
{ $value = 0; }
else
@@ -96,19 +98,21 @@
while(<SETTINGS>)
{
+ $_ =~ s/\r?\n//;
if(/^----$/) # New variable.
{
if($descriptor ne '')
{ do_variable($descriptor, $prompt, $comment); }
$descriptor = <SETTINGS>; # Read descriptor.
+ $descriptor =~ s/\r?\n//;
$prompt = '';
$comment = '';
}
elsif(/^\/\//) # Comment for variablle.
- { $comment = $comment . $_; }
+ { $comment = $comment . $_ . "\n"; }
else # Prompt for variable.
- { $prompt = $prompt . $_; }
+ { $prompt = $prompt . $_ . "\n"; }
}
if($descriptor ne '')
|
|
From: Scott M. <sm...@us...> - 2002-02-22 14:46:11
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv11105
Modified Files:
ChangeLog.txt
Log Message:
Merge 0.21 bugfixes into trunk.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog.txt 14 Jan 2002 18:01:04 -0000 1.5
+++ ChangeLog.txt 22 Feb 2002 14:46:07 -0000 1.6
@@ -3,6 +3,45 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2002-02-19 Scott Moonen <sm...@an....
+
+ * Added code to HTML template to add the page's name, with WikiWords
+ split apart, to the list of meta keywords for a page. This should
+ aid in search engine categorization of pages.
+ * Optimized some of the SQL to use JOINs instead of manual simulation
+ of nested selects.
+ * Changed header regular expression to allow whitespace before first
+ equals sign and after last equals sign.
+
+2002-02-18 Scott Moonen <sm...@an...>
+
+ * Fix bug causing RSS parameters (min=mmm, days=nnn) to be ignored.
+
+2002-02-15 Scott Moonen <sm...@an...>
+
+ * Modified code so as to avoid generating warnings when PHP config
+ variable error_reporting is cranked up to 15. All of the immediately
+ evident at-fault code has been fixed.
+ * Allow URLs to end in an underscore (_).
+ * Relaxed rules for characters permitted in free-link page names.
+ * Relaxed rules for characters allowed in page anchors.
+ * Fixed problems in configure.pl related to quotes in strings and files
+ in DOS format.
+ * Modified templates so that a Content-Length header is emitted. This
+ should allow browsers to implement persistent connections, thereby
+ speeding up page loading.
+
+2002-02-14 Scott Moonen <sm...@an...>
+
+ * Work around regex bug in PHP 4.03 that causes freelinks to render
+ improperly.
+ * Fixed numerous bugs wherein pages with a single quote in their names
+ would generate bad SQL, thereby aborting the engine.
+ * Fixed a bug in the code that maintains the link database that caused
+ it to double-count some links.
+ * Fixed bug that caused Mozilla to show a blank page when saving
+ preferences.
+
2002-01-14 Scott Moonen <sm...@an...>
* Introduce '!' as a no-link escape. E.g., !SandBox renders
|
|
From: Scott M. <sm...@us...> - 2002-02-22 14:35:57
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv7272/parse
Modified Files:
Tag: release-v0_21-bugfix-branch
transforms.php
Log Message:
Add {, }, [, and ] to acceptible free link characters.
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.24.2.6
retrieving revision 1.24.2.7
diff -u -d -r1.24.2.6 -r1.24.2.7
--- transforms.php 19 Feb 2002 18:17:34 -0000 1.24.2.6
+++ transforms.php 22 Feb 2002 14:35:53 -0000 1.24.2.7
@@ -81,11 +81,11 @@
if($validate)
{
- $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"&\xc0-\xff]+)()()\\)\\)/e";
+ $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)()()\\)\\)/e";
}
else
{
- $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"&\xc0-\xff]+)(\|[-A-Za-z0-9 _+\\/.,;:!?'\"&\xc0-\xff]+)?(\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\)/e";
+ $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)(\|[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+)?(\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\)/e";
}
return preg_replace($ptn,
|
|
From: Scott M. <sm...@us...> - 2002-02-20 13:42:18
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv22371
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
Fix misrepresentation
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.14
retrieving revision 1.5.2.15
diff -u -d -r1.5.2.14 -r1.5.2.15
--- ChangeLog.txt 19 Feb 2002 18:17:34 -0000 1.5.2.14
+++ ChangeLog.txt 20 Feb 2002 13:42:13 -0000 1.5.2.15
@@ -20,7 +20,7 @@
2002-02-15 Scott Moonen <sm...@an...>
* Modified code so as to avoid generating warnings when PHP config
- variable error_reporting is cranked up to 8. All of the immediately
+ variable error_reporting is cranked up to 15. All of the immediately
evident at-fault code has been fixed.
* Allow URLs to end in an underscore (_).
* Relaxed rules for characters permitted in free-link page names.
|
|
From: Scott M. <sm...@us...> - 2002-02-19 21:20:47
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9636/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
pagestore.php
Log Message:
cleanup
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- pagestore.php 19 Feb 2002 21:19:59 -0000 1.4.2.5
+++ pagestore.php 19 Feb 2002 21:20:44 -0000 1.4.2.6
@@ -265,23 +265,10 @@
"GROUP BY t2.title, t1.version " .
"HAVING t1.version = MAX(t2.version) " .
"AND t1.body=''");
-// $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
-// "GROUP BY title");
$list = array();
while(($result = $this->dbh->result($qid)))
{
-// $esc_page = addslashes($result[0]);
-// $q2 = $this->dbh->query("SELECT author, time, username, comment " .
-// "FROM $PgTbl " .
-// "WHERE title='$esc_page' " .
-// "AND version='$result[1]' " .
-// "AND body=''");
-// if(($auth_res = $this->dbh->result($q2)))
-// {
-// $list[] = array($auth_res[1], $result[0], $auth_res[0],
-// $auth_res[2], 0, $auth_res[3]);
-// }
$list[] = array($result[3], $result[0], $result[2],
$result[4], 0, $result[5]);
}
|
|
From: Scott M. <sm...@us...> - 2002-02-19 21:20:02
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9261/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
pagestore.php
Log Message:
Optimize deleted-pages SQL: convert simulated sub-select into JOIN.
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- pagestore.php 19 Feb 2002 21:13:36 -0000 1.4.2.4
+++ pagestore.php 19 Feb 2002 21:19:59 -0000 1.4.2.5
@@ -257,23 +257,33 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
- "GROUP BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.version, t1.author, " .
+ "t1.time, t1.username, t1.comment, t1.body, " .
+ "MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version) " .
+ "AND t1.body=''");
+// $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
+// "GROUP BY title");
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $esc_page = addslashes($result[0]);
- $q2 = $this->dbh->query("SELECT author, time, username, comment " .
- "FROM $PgTbl " .
- "WHERE title='$esc_page' " .
- "AND version='$result[1]' " .
- "AND body=''");
- if(($auth_res = $this->dbh->result($q2)))
- {
- $list[] = array($auth_res[1], $result[0], $auth_res[0],
- $auth_res[2], 0, $auth_res[3]);
- }
+// $esc_page = addslashes($result[0]);
+// $q2 = $this->dbh->query("SELECT author, time, username, comment " .
+// "FROM $PgTbl " .
+// "WHERE title='$esc_page' " .
+// "AND version='$result[1]' " .
+// "AND body=''");
+// if(($auth_res = $this->dbh->result($q2)))
+// {
+// $list[] = array($auth_res[1], $result[0], $auth_res[0],
+// $auth_res[2], 0, $auth_res[3]);
+// }
+ $list[] = array($result[3], $result[0], $result[2],
+ $result[4], 0, $result[5]);
}
return $list;
|
|
From: Scott M. <sm...@us...> - 2002-02-19 21:13:40
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7732/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
pagestore.php
Log Message:
Optimize find SQL by converting simulated sub-select into a JOIN.
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- pagestore.php 19 Feb 2002 20:37:14 -0000 1.4.2.3
+++ pagestore.php 19 Feb 2002 21:13:36 -0000 1.4.2.4
@@ -28,21 +28,19 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, max(version) FROM $PgTbl " .
- "GROUP BY title ORDER BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.body, t1.version, " .
+ "MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version) " .
+ "AND (body LIKE '%$text%' OR title LIKE '%$text%')");
+
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $esc_page = addslashes($result[0]);
- $q2 = $this->dbh->query("SELECT title FROM $PgTbl " .
- "WHERE title='$esc_page' " .
- "AND version='$result[1]' " .
- "AND (body LIKE '%$text%' " .
- "OR title LIKE '%$text%')");
-
- if($this->dbh->result($q2))
- { $list[] = $result[0]; }
+ $list[] = $result[0];
}
return $list;
|
|
From: Scott M. <sm...@us...> - 2002-02-19 20:37:19
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv28688/parse
Modified Files:
Tag: release-v0_21-bugfix-branch
macros.php
Log Message:
Optimize WantedPages SQL: use JOIN instead of simulated sub-selects.
Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- macros.php 15 Feb 2002 19:30:37 -0000 1.9.2.2
+++ macros.php 19 Feb 2002 20:37:14 -0000 1.9.2.3
@@ -156,24 +156,23 @@
$text = '';
$first = 1;
- $q1 = $pagestore->dbh->query("SELECT link, SUM(count) AS ct FROM $LkTbl " .
- "GROUP BY link ORDER BY ct DESC, link");
+ $q1 = $pagestore->dbh->query("SELECT l.link, SUM(l.count) AS ct, p.title " .
+ "FROM $LkTbl AS l LEFT JOIN $PgTbl AS p " .
+ "ON l.link = p.title " .
+ "GROUP BY l.link " .
+ "HAVING p.title IS NULL " .
+ "ORDER BY ct DESC, l.link");
+
while(($result = $pagestore->dbh->result($q1)))
{
- $esc_page = addslashes($result[0]);
- $q2 = $pagestore->dbh->query("SELECT MAX(version) FROM $PgTbl " .
- "WHERE title='$esc_page'");
- if(!($r2 = $pagestore->dbh->result($q2)) || empty($r2[0]))
- {
- if(!$first) // Don't prepend newline to first one.
- { $text = $text . "\n"; }
- else
- { $first = 0; }
+ if(!$first) // Don't prepend newline to first one.
+ { $text = $text . "\n"; }
+ else
+ { $first = 0; }
- $text = $text . '(' .
- html_url(findURL($result[0]), $result[1]) .
- ') ' . html_ref($result[0], $result[0]);
- }
+ $text = $text . '(' .
+ html_url(findURL($result[0]), $result[1]) .
+ ') ' . html_ref($result[0], $result[0]);
}
return html_code($text);
@@ -210,6 +209,13 @@
$text = '';
$first = 1;
+
+// It's not quite as straightforward as one would imagine to turn the
+// following code into a JOIN, since we want to avoid multiplying the
+// number of links to a page by the number of versions of that page that
+// exist. If anyone has some efficient suggestions, I'd be welcome to
+// entertain them. -- ScottMoonen
+
$q1 = $pagestore->dbh->query("SELECT link, SUM(count) AS ct FROM $LkTbl " .
"GROUP BY link ORDER BY ct DESC, link");
while(($result = $pagestore->dbh->result($q1)))
|
|
From: Scott M. <sm...@us...> - 2002-02-19 20:37:19
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28688/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
pagestore.php
Log Message:
Optimize WantedPages SQL: use JOIN instead of simulated sub-selects.
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- pagestore.php 19 Feb 2002 18:08:41 -0000 1.4.2.2
+++ pagestore.php 19 Feb 2002 20:37:14 -0000 1.4.2.3
@@ -223,8 +223,7 @@
"FROM $PgTbl AS t1, $PgTbl AS t2 " .
"WHERE t1.title = t2.title " .
"GROUP BY t2.title, t1.version " .
- "HAVING t1.version = MAX(t2.version) "
- );
+ "HAVING t1.version = MAX(t2.version)");
$list = array();
while(($result = $this->dbh->result($qid)))
|
|
From: Scott M. <sm...@us...> - 2002-02-19 18:17:38
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv26193/parse
Modified Files:
Tag: release-v0_21-bugfix-branch
transforms.php
Log Message:
Relax header regex.
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -d -r1.24.2.5 -r1.24.2.6
--- transforms.php 15 Feb 2002 19:30:37 -0000 1.24.2.5
+++ transforms.php 19 Feb 2002 18:17:34 -0000 1.24.2.6
@@ -485,7 +485,7 @@
{
global $MaxHeading;
- if(!preg_match('/^(=+) (.*) (=+)$/', $text, $result))
+ if(!preg_match('/^\s*(=+) (.*) (=+)\s*$/', $text, $result))
{ return $text; }
if(strlen($result[1]) != strlen($result[3]))
|
|
From: Scott M. <sm...@us...> - 2002-02-19 18:17:38
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv26193
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
Relax header regex.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -d -r1.5.2.13 -r1.5.2.14
--- ChangeLog.txt 19 Feb 2002 18:08:41 -0000 1.5.2.13
+++ ChangeLog.txt 19 Feb 2002 18:17:34 -0000 1.5.2.14
@@ -10,6 +10,8 @@
aid in search engine categorization of pages.
* Optimized some of the SQL to use JOINs instead of manual simulation
of nested selects.
+ * Changed header regular expression to allow whitespace before first
+ equals sign and after last equals sign.
2002-02-18 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2002-02-19 18:08:46
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv20300
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
SQL Optimization: convert RecentChanges to a JOIN.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -d -r1.5.2.12 -r1.5.2.13
--- ChangeLog.txt 19 Feb 2002 16:43:13 -0000 1.5.2.12
+++ ChangeLog.txt 19 Feb 2002 18:08:41 -0000 1.5.2.13
@@ -8,6 +8,8 @@
* Added code to HTML template to add the page's name, with WikiWords
split apart, to the list of meta keywords for a page. This should
aid in search engine categorization of pages.
+ * Optimized some of the SQL to use JOINs instead of manual simulation
+ of nested selects.
2002-02-18 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2002-02-19 18:08:45
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20300/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
pagestore.php
Log Message:
SQL Optimization: convert RecentChanges to a JOIN.
Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- pagestore.php 14 Feb 2002 20:11:24 -0000 1.4.2.1
+++ pagestore.php 19 Feb 2002 18:08:41 -0000 1.4.2.2
@@ -217,22 +217,20 @@
{
global $PgTbl;
- $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
- "GROUP BY title");
+ $qid = $this->dbh->query("SELECT t1.title, t1.version, t1.author, t1.time, " .
+ "t1.username, LENGTH(t1.body), t1.comment, " .
+ "t1.mutable, MAX(t2.version) " .
+ "FROM $PgTbl AS t1, $PgTbl AS t2 " .
+ "WHERE t1.title = t2.title " .
+ "GROUP BY t2.title, t1.version " .
+ "HAVING t1.version = MAX(t2.version) "
+ );
$list = array();
while(($result = $this->dbh->result($qid)))
{
- $esc_page = addslashes($result[0]);
- $q2 = $this->dbh->query("SELECT author, time, username, LENGTH(body), " .
- "comment, mutable " .
- "FROM $PgTbl " .
- "WHERE title='$esc_page' " .
- "AND version='$result[1]'");
- $auth_res = $this->dbh->result($q2);
-
- $list[] = array($auth_res[1], $result[0], $auth_res[0], $auth_res[2],
- $auth_res[3], $auth_res[4], $auth_res[5] == 'on', $result[1]);
+ $list[] = array($result[3], $result[0], $result[2], $result[4],
+ $result[5], $result[6], $result[7] == 'on', $result[1]);
}
return $list;
|
|
From: Scott M. <sm...@us...> - 2002-02-19 16:43:16
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv6323
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
clarity
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -d -r1.5.2.11 -r1.5.2.12
--- ChangeLog.txt 19 Feb 2002 16:42:51 -0000 1.5.2.11
+++ ChangeLog.txt 19 Feb 2002 16:43:13 -0000 1.5.2.12
@@ -6,8 +6,8 @@
2002-02-19 Scott Moonen <sm...@an....
* Added code to HTML template to add the page's name, with WikiWords
- split apart, to the list of keywords for a page. This should aid
- in search engine categorization of pages.
+ split apart, to the list of meta keywords for a page. This should
+ aid in search engine categorization of pages.
2002-02-18 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2002-02-19 16:42:55
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv6079
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
Added page's WikiWords to its list of meta keywords.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -d -r1.5.2.10 -r1.5.2.11
--- ChangeLog.txt 18 Feb 2002 16:18:04 -0000 1.5.2.10
+++ ChangeLog.txt 19 Feb 2002 16:42:51 -0000 1.5.2.11
@@ -3,6 +3,12 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2002-02-19 Scott Moonen <sm...@an....
+
+ * Added code to HTML template to add the page's name, with WikiWords
+ split apart, to the list of keywords for a page. This should aid
+ in search engine categorization of pages.
+
2002-02-18 Scott Moonen <sm...@an...>
* Fix bug causing RSS parameters (min=mmm, days=nnn) to be ignored.
|
|
From: Scott M. <sm...@us...> - 2002-02-19 16:42:55
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv6079/template
Modified Files:
Tag: release-v0_21-bugfix-branch
common.php
Log Message:
Added page's WikiWords to its list of meta keywords.
Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- common.php 15 Feb 2002 20:54:30 -0000 1.7.2.1
+++ common.php 19 Feb 2002 16:42:51 -0000 1.7.2.2
@@ -24,6 +24,9 @@
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords;
+ $keywords = ' ' . html_split_name($args['headlink']);
+ $keywords = str_replace('"', '"', $keywords);
+
ob_start(); // Start buffering output.
if($SeparateTitleWords)
@@ -34,7 +37,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
-<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
+<meta name="KEYWORDS" content="<?php print $MetaKeywords . $keywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<?php
if($args['norobots'])
|
|
From: Scott M. <sm...@us...> - 2002-02-18 20:48:42
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv12731/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
category.php
Log Message:
Force add-to-category edit comment to blank (instead of previous version's value).
Index: category.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/category.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- category.php 4 Jan 2002 20:38:42 -0000 1.6
+++ category.php 18 Feb 2002 20:48:39 -0000 1.6.2.1
@@ -42,6 +42,7 @@
$pg->text = str_replace("'", "\\'", $pg->text);
$pg->version++;
+ $pg->comment = '';
$pg->hostname = gethostbyaddr($REMOTE_ADDR);
$pg->username = $UserName;
|
|
From: Scott M. <sm...@us...> - 2002-02-18 16:18:08
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27569/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
main.php
Log Message:
Fix bug causing RSS parameters (min=mmm, days=nnn) to be ignored.
Index: main.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/main.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- main.php 15 Feb 2002 16:34:29 -0000 1.2.2.2
+++ main.php 18 Feb 2002 16:18:04 -0000 1.2.2.3
@@ -27,6 +27,10 @@
? $HTTP_GET_VARS['version'] : '';
$full = isset($HTTP_GET_VARS['full'])
? $HTTP_GET_VARS['full'] : '';
+$min = isset($HTTP_GET_VARS['min'])
+ ? $HTTP_GET_VARS['min'] : '';
+$days = isset($HTTP_GET_VARS['days'])
+ ? $HTTP_GET_VARS['days'] : '';
$Preview = isset($HTTP_POST_VARS['Preview'])
? $HTTP_POST_VARS['Preview'] : '';
@@ -43,7 +47,7 @@
$comment = isset($HTTP_POST_VARS['comment'])
? $HTTP_POST_VARS['comment'] : '';
$days = isset($HTTP_POST_VARS['days'])
- ? $HTTP_POST_VARS['days'] : '';
+ ? $HTTP_POST_VARS['days'] : $days;
$discard = isset($HTTP_POST_VARS['discard'])
? $HTTP_POST_VARS['discard'] : '';
$document = isset($HTTP_POST_VARS['document'])
@@ -51,7 +55,7 @@
$hist = isset($HTTP_POST_VARS['hist'])
? $HTTP_POST_VARS['hist'] : '';
$min = isset($HTTP_POST_VARS['min'])
- ? $HTTP_POST_VARS['min'] : '';
+ ? $HTTP_POST_VARS['min'] : $min;
$nextver = isset($HTTP_POST_VARS['nextver'])
? $HTTP_POST_VARS['nextver'] : '';
$rows = isset($HTTP_POST_VARS['rows'])
|
|
From: Scott M. <sm...@us...> - 2002-02-18 16:18:08
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv27569
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
Fix bug causing RSS parameters (min=mmm, days=nnn) to be ignored.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -d -r1.5.2.9 -r1.5.2.10
--- ChangeLog.txt 15 Feb 2002 20:54:29 -0000 1.5.2.9
+++ ChangeLog.txt 18 Feb 2002 16:18:04 -0000 1.5.2.10
@@ -3,6 +3,10 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2002-02-18 Scott Moonen <sm...@an...>
+
+ * Fix bug causing RSS parameters (min=mmm, days=nnn) to be ignored.
+
2002-02-15 Scott Moonen <sm...@an...>
* Modified code so as to avoid generating warnings when PHP config
|
|
From: Scott M. <sm...@us...> - 2002-02-15 20:54:36
|
Update of /cvsroot/tavi/tavi/action
In directory usw-pr-cvs1:/tmp/cvs-serv26964/action
Modified Files:
Tag: release-v0_21-bugfix-branch
admin.php style.php
Log Message:
Emit Content-Length header.
More undefined variable/index fixes.
Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/admin.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- admin.php 7 Jan 2002 18:13:58 -0000 1.1
+++ admin.php 15 Feb 2002 20:54:29 -0000 1.1.2.1
@@ -1,6 +1,9 @@
<?php
// $Id$
+// Don't freak out lib/init.php.
+$document = $categories = $comment = $page = '';
+
require('lib/init.php');
require('parse/html.php');
require('parse/transforms.php');
@@ -9,35 +12,45 @@
if($AdminEnabled != 1)
{ die($ErrorAdminDisabled); }
-// If register_globals is off, we need to harvest the script parameters
-// at this point.
+// Harvest script parameters.
-if(!ini_get('register_globals'))
+$REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
+ ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
+
+if(isset($HTTP_GET_VARS['locking']))
+ { $locking = $HTTP_GET_VARS['locking']; }
+if(isset($HTTP_GET_VARS['blocking']))
+ { $blocking = $HTTP_GET_VARS['blocking']; }
+if(!isset($locking))
{
- $REMOTE_ADDR = $HTTP_SERVER_VARS['REMOTE_ADDR'];
+ $locking = isset($HTTP_POST_VARS['locking'])
+ ? $HTTP_POST_VARS['locking'] : '';
+}
+if(!isset($blocking))
+{
+ $blocking = isset($HTTP_POST_VARS['blocking'])
+ ? $HTTP_POST_VARS['blocking'] : '';
+}
- $locking = $HTTP_GET_VARS['locking'];
- $blocking = $HTTP_GET_VARS['blocking'];
+$Block = isset($HTTP_POST_VARS['Block'])
+ ? $HTTP_POST_VARS['Block'] : '';
+$Unblock = isset($HTTP_POST_VARS['Unblock'])
+ ? $HTTP_POST_VARS['Unblock'] : '';
+$Save = isset($HTTP_POST_VARS['Save'])
+ ? $HTTP_POST_VARS['Save'] : '';
+$address = isset($HTTP_POST_VARS['address'])
+ ? $HTTP_POST_VARS['address'] : '';
- $Block = $HTTP_POST_VARS['Block'];
- $Unblock = $HTTP_POST_VARS['Unblock'];
- $Save = $HTTP_POST_VARS['Save'];
- $address = $HTTP_POST_VARS['address'];
- if(!isset($blocking))
- { $blocking = $HTTP_POST_VARS['blocking']; }
- if(!isset($locking))
- { $locking = $HTTP_POST_VARS['locking']; }
- $count = $HTTP_POST_VARS['count'];
+$count = isset($HTTP_POST_VARS['count']) ? $HTTP_POST_VARS['count'] : 0;
- if($locking && $count > 0)
+if($locking && $count > 0)
+{
+ for($i = 1; $i <= $count; $i++)
{
- for($i = 1; $i <= $count; $i++)
- {
- $var = 'name' + $i;
- $$var = $HTTP_POST_VARS[$var];
- $var = 'lock' + $i;
- $$var = $HTTP_POST_VARS[$var];
- }
+ $var = 'name' + $i;
+ $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
+ $var = 'lock' + $i;
+ $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
}
}
@@ -57,7 +70,10 @@
for($i = 1; $i <= $count; $i++)
{
$page = urldecode($HTTP_POST_VARS['name' . $i]);
- $lock = ($HTTP_POST_VARS['lock' . $i] == '1');
+ if(isset($HTTP_POST_VARS['lock' . $i]))
+ { $lock = $HTTP_POST_VARS['lock' . $i]; }
+ else
+ { $lock = 0; }
$pg = $pagestore->page($page);
$pg->read();
$pg->version++;
Index: style.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/style.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- style.php 8 Jan 2002 17:31:00 -0000 1.1
+++ style.php 15 Feb 2002 20:54:30 -0000 1.1.2.1
@@ -7,6 +7,12 @@
{
header("Content-type: text/css");
+ ob_start();
+
require(TemplateDir . '/wiki.css');
+
+ $size = ob_get_length();
+ header("Content-Length: $size");
+ ob_end_flush();
}
|
|
From: Scott M. <sm...@us...> - 2002-02-15 20:54:35
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26964/lib
Modified Files:
Tag: release-v0_21-bugfix-branch
init.php
Log Message:
Emit Content-Length header.
More undefined variable/index fixes.
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- init.php 3 Jan 2002 21:46:23 -0000 1.8
+++ init.php 15 Feb 2002 20:54:30 -0000 1.8.2.1
@@ -36,7 +36,8 @@
// Read user preferences from cookie.
-$prefstr = $HTTP_COOKIE_VARS[$CookieName];
+$prefstr = isset($HTTP_COOKIE_VARS[$CookieName])
+ ? $HTTP_COOKIE_VARS[$CookieName] : '';
if(!empty($prefstr))
{
|
|
From: Scott M. <sm...@us...> - 2002-02-15 20:54:35
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv26964
Modified Files:
Tag: release-v0_21-bugfix-branch
ChangeLog.txt
Log Message:
Emit Content-Length header.
More undefined variable/index fixes.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -d -r1.5.2.8 -r1.5.2.9
--- ChangeLog.txt 15 Feb 2002 20:06:09 -0000 1.5.2.8
+++ ChangeLog.txt 15 Feb 2002 20:54:29 -0000 1.5.2.9
@@ -13,6 +13,9 @@
* Relaxed rules for characters allowed in page anchors.
* Fixed problems in configure.pl related to quotes in strings and files
in DOS format.
+ * Modified templates so that a Content-Length header is emitted. This
+ should allow browsers to implement persistent connections, thereby
+ speeding up page loading.
2002-02-14 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2002-02-15 20:54:35
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv26964/template
Modified Files:
Tag: release-v0_21-bugfix-branch
common.php
Log Message:
Emit Content-Length header.
More undefined variable/index fixes.
Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- common.php 15 Jan 2002 16:22:39 -0000 1.7
+++ common.php 15 Feb 2002 20:54:30 -0000 1.7.2.1
@@ -24,6 +24,8 @@
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords;
+ ob_start(); // Start buffering output.
+
if($SeparateTitleWords)
{ $args['title'] = html_split_name($args['title']); }
?>
@@ -170,5 +172,9 @@
</body>
</html>
<?php
+
+ $size = ob_get_length();
+ header("Content-Length: $size");
+ ob_end_flush();
}
?>
|
|
From: Scott M. <sm...@us...> - 2002-02-15 20:06:16
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv13714/install
Modified Files:
Tag: release-v0_21-bugfix-branch
configure.pl
Log Message:
Fixup configure.pl
Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- configure.pl 8 Jan 2002 20:36:44 -0000 1.7
+++ configure.pl 15 Feb 2002 20:06:09 -0000 1.7.2.1
@@ -51,7 +51,9 @@
{
print 'Enter value: ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
+ $value =~ s/\\/\\\\/g;
+ $value =~ s/'/\\'/g;
$value = "'" . $value . "'";
}
elsif($descriptor =~ /^boolean/)
@@ -60,7 +62,7 @@
{
print 'Enter setting (y/N): ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
if($value =~ /[Yy]/) # Value is on.
{ $value = 1; }
else
@@ -70,7 +72,7 @@
{
print 'Enter setting (Y/n): ';
$value = <STDIN>;
- chop $value;
+ $value =~ s/\r?\n//;
if($value =~ /[Nn]/) # Value is off.
{ $value = 0; }
else
@@ -96,19 +98,21 @@
while(<SETTINGS>)
{
+ $_ =~ s/\r?\n//;
if(/^----$/) # New variable.
{
if($descriptor ne '')
{ do_variable($descriptor, $prompt, $comment); }
$descriptor = <SETTINGS>; # Read descriptor.
+ $descriptor =~ s/\r?\n//;
$prompt = '';
$comment = '';
}
elsif(/^\/\//) # Comment for variablle.
- { $comment = $comment . $_; }
+ { $comment = $comment . $_ . "\n"; }
else # Prompt for variable.
- { $prompt = $prompt . $_; }
+ { $prompt = $prompt . $_ . "\n"; }
}
if($descriptor ne '')
|
12 messages has been excluded from this view by a project administrator.
