[Nextcms-commits] CVS: nextcms/extensions hmenu.php,1.1.1.1,1.2 index.php,1.1,1.2 sitemap.php,1.1,1.2 vmenu.php,1.2,1.3

[Andrej B. <an...@us...>]

Update of /cvsroot/nextcms/nextcms/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv24337/extensions

Modified Files:
	hmenu.php index.php sitemap.php vmenu.php 
Log Message:
* add a mapper class
* some bugs fixed
* some minor code changes
* warning: previous extension may not compatible with this version


Index: hmenu.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/extensions/hmenu.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hmenu.php	19 Mar 2002 17:51:06 -0000	1.1.1.1
--- hmenu.php	30 Apr 2002 23:58:18 -0000	1.2
***************
*** 5,9 ****
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = relToAbs($site_xmltree->getAttribute($path, 'file'), dirname($this->page->site->filename));
  
  			if ($active)
--- 5,9 ----
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = $this->page->site->getVirtualUrlByPath($path);
  
  			if ($active)
***************
*** 17,21 ****
  		function getCode() {
  			$site_xmltree = &$this->page->site->xmltree;
! 			$menuentries = $site_xmltree->getNode("/site[1]/pages[1]/page[1]", false);
  			$menulinkcode = array();
  			$one_was_active = false;
--- 17,21 ----
  		function getCode() {
  			$site_xmltree = &$this->page->site->xmltree;
! 			$menuentries = $site_xmltree->getNode("/site[1]/pages[1]/page[1]", false, 'page');
  			$menulinkcode = array();
  			$one_was_active = false;

Index: index.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/extensions/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	25 Mar 2002 15:57:42 -0000	1.1
--- index.php	30 Apr 2002 23:58:18 -0000	1.2
***************
*** 5,9 ****
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = relToAbs($site_xmltree->getAttribute($path, 'file'), dirname($this->page->site->filename));
  
  			return "<a href=\"$file\">$name</a>";
--- 5,9 ----
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = $this->page->site->getVirtualUrlByPath($path);
  
  			return "<a href=\"$file\">$name</a>";

Index: sitemap.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/extensions/sitemap.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sitemap.php	25 Mar 2002 15:57:42 -0000	1.1
--- sitemap.php	30 Apr 2002 23:58:18 -0000	1.2
***************
*** 7,11 ****
  			$id = $site_xmltree->getAttribute($path, 'id');
  			
! 			$file = relToAbs($site_xmltree->getAttribute($path, 'file'), dirname($this->page->site->filename));
  
  			$css_class = "sitemap_link";
--- 7,11 ----
  			$id = $site_xmltree->getAttribute($path, 'id');
  			
! 			$file = $this->page->site->getVirtualUrlByPath($path);
  
  			$css_class = "sitemap_link";
***************
*** 19,23 ****
  			$site_xmltree = &$this->page->site->xmltree;
  			$basepath = "/site[1]/pages[1]/page[1]";
! 			$menuentries = $site_xmltree->getNode($basepath, true);
  			$this->basedepth = $site_xmltree->getDepth($basepath) + 1;
  
--- 19,23 ----
  			$site_xmltree = &$this->page->site->xmltree;
  			$basepath = "/site[1]/pages[1]/page[1]";
! 			$menuentries = $site_xmltree->getNode($basepath, true, "page");
  			$this->basedepth = $site_xmltree->getDepth($basepath) + 1;
  

Index: vmenu.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/extensions/vmenu.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vmenu.php	25 Mar 2002 15:57:42 -0000	1.2
--- vmenu.php	30 Apr 2002 23:58:18 -0000	1.3
***************
*** 5,9 ****
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = relToAbs($site_xmltree->getAttribute($path, 'file'), dirname($this->page->site->filename));
  
  			if ($active)
--- 5,9 ----
  			$site_xmltree = &$this->page->site->xmltree;
  			$name = $site_xmltree->getAttribute($path, 'name');
! 			$file = $this->page->site->getVirtualUrlByPath($path);
  
  			if ($active)
***************
*** 17,21 ****
  		function getCode() {
  			$site_xmltree = &$this->page->site->xmltree;
! 			$menuentries = $site_xmltree->getNode("/site[1]/pages[1]/page[1]", false);
  			$menulinkcode = array();
  			$one_was_active = false;
--- 17,21 ----
  		function getCode() {
  			$site_xmltree = &$this->page->site->xmltree;
! 			$menuentries = $site_xmltree->getNode("/site[1]/pages[1]/page[1]", false, "page");
  			$menulinkcode = array();
  			$one_was_active = false;