[Nextcms-commits] CVS: nextcms class.Page.php,1.2,1.3 class.Site.php,1.2,1.3 utils.php,1.1.1.1,1.2

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

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

Modified Files:
	class.Page.php class.Site.php utils.php 
Log Message:
added new extensions
added {sitetitle} to templates
minor changes and fixes


Index: class.Page.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/class.Page.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.Page.php	19 Mar 2002 19:18:37 -0000	1.2
--- class.Page.php	25 Mar 2002 15:57:42 -0000	1.3
***************
*** 173,176 ****
--- 173,180 ----
  				break;
  
+ 				case "sitetitle":
+ 					return $this->site->title;
+ 				break;
+ 				
  				case "title":
  					return $this->pagetitle;

Index: class.Site.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/class.Site.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.Site.php	25 Mar 2002 09:47:32 -0000	1.2
--- class.Site.php	25 Mar 2002 15:57:42 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  		var $template_files;
  		var $template_nodes;
+ 		var $title;
  
  		/**
***************
*** 32,35 ****
--- 33,40 ----
  			// get siteroot directory
  			$this->root = $this->xmltree->getAttribute('/site[1]', 'siteroot');
+ 
+ 			$this->title = $this->xmltree->getAttribute('/site[1]', 'title');
+ 			if (!isset($this->title))
+ 				$this->title = "";
  
  			// get some data from template section of the site file

Index: utils.php
===================================================================
RCS file: /cvsroot/nextcms/nextcms/utils.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** utils.php	19 Mar 2002 17:51:06 -0000	1.1.1.1
--- utils.php	25 Mar 2002 15:57:42 -0000	1.2
***************
*** 17,30 ****
  		$PATH = getenv('PATH');
  
! 		if ( stristr ( $SERVER_SOFTWARE, 'Win' ) )
  			return 'win';
! 		if ( stristr ( $SERVER_SOFTWARE, 'Microsoft' ) )
  			return 'win';
! 		if ( stristr ( $SERVER_SOFTWARE, 'Unix' ) )
  			return 'nix';
  
! 		if ( stristr ( $PATH, 'C:' ) )
  			return 'win';
! 		if ( stristr ( $PATH, '/X11' ) )
  			return 'nix';
  	}
--- 17,30 ----
  		$PATH = getenv('PATH');
  
! 		if (stristr($SERVER_SOFTWARE, 'Win'))
  			return 'win';
! 		if (stristr ($SERVER_SOFTWARE, 'Microsoft'))
  			return 'win';
! 		if (stristr ($SERVER_SOFTWARE, 'Unix'))
  			return 'nix';
  
! 		if (stristr ($PATH, 'C:'))
  			return 'win';
! 		if (stristr ($PATH, '/X11'))
  			return 'nix';
  	}
***************
*** 90,94 ****
  	* printError() displays the a error message if an error occurs and exits the script
  	*
- 	* @access private
  	*/
  
--- 90,93 ----
***************
*** 105,109 ****
  	/**
  	* relToAbs() turns a relative path into a absolute
! 	* exsample: ../index.html to /siteroot/index.html
  	*
  	* @param $path is the relative input path
--- 104,108 ----
  	/**
  	* relToAbs() turns a relative path into a absolute
! 	* example: ../index.html to /siteroot/index.html
  	*
  	* @param $path is the relative input path
***************
*** 128,133 ****
  		return $retpath;
  	}
  	/**
! 	* loadFile() returns the contents of a file and displays a error message one occurs
  	*
  	*/
--- 127,133 ----
  		return $retpath;
  	}
+ 
  	/**
! 	* loadFile() returns the contents of a file and displays a error message if one occurs
  	*
  	*/