[Nextcms-commits] CVS: nextcms class.Cache.php,1.5,1.6 class.Page.php,1.8,1.9 class.Site.php,1.8,1.9
Status: Alpha
Brought to you by:
andrejb
Menu
▾
▴
[Nextcms-commits] CVS: nextcms class.Cache.php,1.5,1.6 class.Page.php,1.8,1.9 class.Site.php,1.8,1.9 processor.php,1.8,1.9 xml.php,1.4,1.5
|
From: Andrej B. <an...@us...> - 2003-01-08 18:35:52
|
Update of /cvsroot/nextcms/nextcms
In directory sc8-pr-cvs1:/tmp/cvs-serv5003
Modified Files:
class.Cache.php class.Page.php class.Site.php processor.php
xml.php
Log Message:
* printerversion bug fixed
* minor changes
Index: class.Cache.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/class.Cache.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.Cache.php 27 May 2002 23:50:10 -0000 1.5
--- class.Cache.php 8 Jan 2003 18:35:48 -0000 1.6
***************
*** 31,35 ****
foreach ($check_file as $filename) {
if (file_exists($docroot . $filename)) {
! if (fileatime($docroot . $filename) > $this->filemtime) {
fclose($cache_file); return;
}
--- 31,35 ----
foreach ($check_file as $filename) {
if (file_exists($docroot . $filename)) {
! if (filemtime($docroot . $filename) > $this->filemtime) {
fclose($cache_file); return;
}
Index: class.Page.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/class.Page.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.Page.php 31 Dec 2002 11:14:35 -0000 1.8
--- class.Page.php 8 Jan 2003 18:35:48 -0000 1.9
***************
*** 46,50 ****
// check if we can handle the requested url
if (!isset($url)) {
! header('HTTP/1.0 404 Not Found');// exit;
printError("404 URL '$virtual_url' is not attached to any site on this server.");
}
--- 46,50 ----
// check if we can handle the requested url
if (!isset($url)) {
! //header('HTTP/1.0 404 Not Found'); exit;
printError("404 URL '$virtual_url' is not attached to any site on this server.");
}
***************
*** 120,125 ****
$docache = false;
! $INPUT = &$GLOBALS['input_vars'];
! switch ($INPUT['show']) {
case 'printerversion':
$this->template = $this->getTemplate($pagenode_path, "printerversion");
--- 120,124 ----
$docache = false;
! switch ($GLOBALS['INPUT']['show']) {
case 'printerversion':
$this->template = $this->getTemplate($pagenode_path, "printerversion");
***************
*** 240,244 ****
}
! $ext_instance = $this->loadExtention($field_name);
if (isset($ext_instance)) {
--- 239,243 ----
}
! $ext_instance = $this->loadExtension($field_name);
if (isset($ext_instance)) {
***************
*** 246,256 ****
}
! if (isset($GLOBALS['input_vars'][$field_name]))
! return $GLOBALS['input_vars'][$field_name];
return '{' . "$field_name" . '}';
}
! function loadExtention($name) {
global $document_root, $settings;
--- 245,255 ----
}
! if (isset($GLOBALS['INPUT'][$field_name]))
! return $GLOBALS['INPUT'][$field_name];
return '{' . "$field_name" . '}';
}
! function loadExtension($name) {
global $document_root, $settings;
***************
*** 407,411 ****
if (($type == CLOSED_TAG) || ($type == START_TAG)) {
if (isset($node['attributes']['name']))
! $ext_instance = $this->loadExtention($node['attributes']['name']);
else
return "";
--- 406,410 ----
if (($type == CLOSED_TAG) || ($type == START_TAG)) {
if (isset($node['attributes']['name']))
! $ext_instance = $this->loadExtension($node['attributes']['name']);
else
return "";
Index: class.Site.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/class.Site.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.Site.php 14 Jul 2002 13:54:32 -0000 1.8
--- class.Site.php 8 Jan 2003 18:35:48 -0000 1.9
***************
*** 40,44 ****
if (!isset($this->root))
$this->root = dirname($this->filename);
! if ($this->root == '/')
$this->root = '';
--- 40,44 ----
if (!isset($this->root))
$this->root = dirname($this->filename);
! if ($this->root == '/' || $this->root == '\\')
$this->root = '';
Index: processor.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/processor.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** processor.php 31 Dec 2002 03:54:38 -0000 1.8
--- processor.php 8 Jan 2003 18:35:48 -0000 1.9
***************
*** 12,16 ****
// disable cache for developing
! // $cache->is_cached = false;
if ($cache->is_cached) {
--- 12,16 ----
// disable cache for developing
! $cache->is_cached = false;
if ($cache->is_cached) {
***************
*** 44,49 ****
// could be unsafe (just for testing)
if (strpos($code, "<contentpage") === false) {
! //virtual($file);
! die($code);
}
}
--- 44,49 ----
// could be unsafe (just for testing)
if (strpos($code, "<contentpage") === false) {
! virtual($file);
! //die($code);
}
}
***************
*** 73,87 ****
// collect POST variables
if (is_array($_POST))
! $INPUT = $_POST;
else
! $INPUT = $GLOBALS['HTTP_POST_VARS'];
!
! $INPUT = array_merge($GET, $POST);
$url = parse_url($GET['file']);
! if (isset($url['query']))
! parse_str($url['query'], $GET);
! else
! $GET = array();
// workaround for unix homedirs e.g. http://domain.tld/~username
--- 73,86 ----
// collect POST variables
if (is_array($_POST))
! $POST = $_POST;
else
! $POST = $GLOBALS['HTTP_POST_VARS'];
+ // collect stealth mode GET variables
$url = parse_url($GET['file']);
! if (isset($url['query'])) {
! parse_str($url['query'], $addToGet);
! $GET = array_merge($addToGet, $GET);
! }
// workaround for unix homedirs e.g. http://domain.tld/~username
***************
*** 89,92 ****
--- 88,92 ----
// $GET['file'] = $url['path'];
+ $INPUT = array_merge($GET, $POST);
$vurl = $url['path'];
Index: xml.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/xml.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
|
