From 3d7a4c84073ee955d2b00b470b022286a54cd7d2 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 15 Aug 2006 04:55:20 +0000
Subject: [PATCH] Switch to actual public/private/protected indicators instead
 of @access ones

---
 api.php                | 33 +++++++++++----------------------
 date.php               | 18 ++++++------------
 db.php                 | 27 +++++++++------------------
 db_mysql.php           |  3 +--
 db_mysqli.php          |  3 +--
 db_postgresql.php      |  9 +++------
 functions.php          | 18 ++++++------------
 graph_pie.php          | 18 ++++++------------
 kernel.php             | 36 ++++++++++++------------------------
 localize.php           |  9 +++------
 mail.php               | 36 ++++++++++++------------------------
 pagination.php         | 30 ++++++++++--------------------
 printer.php            | 18 ++++++------------
 printer_css.php        | 21 +++++++--------------
 printer_navigation.php | 18 ++++++------------
 template.php           | 39 +++++++++++++--------------------------
 template_fs.php        |  9 +++------
 xml.php                | 24 ++++++++----------------
 18 files changed, 123 insertions(+), 246 deletions(-)

diff --git a/api.php b/api.php
index 7388537..2a0a7ed 100644
--- a/api.php
+++ b/api.php
@@ -92,80 +92,69 @@ class API
 	/**
 	* Registry object
 	* @var	object
-	* @access	protected
 	*/
-	var $registry = null;
+	protected $registry = null;
 	
 	/**
 	* Fields: used for verification and sanitization
 	* NAME => array(TYPE, REQUIRED, VERIFY METHOD (:self for self-named method), RELATION => array(FILE, CLASS IN FILE, ALTERNATE FIELD NAME))
 	* @var	array
-	* @access	protected
 	*/
-	var $fields = array();
+	protected $fields = array();
 	
 	/**
 	* Values array: sanitized and verified field values
 	* @var	array
-	* @access	public
 	*/
-	var $values = array();
+	public $values = array();
 	
 	/**
 	* Fields that were manually set with set(), not by using set_existing()
 	* @var	array
-	* @access	private
 	*/
-	var $setfields = array();
+	private $setfields = array();
 	
 	/**
 	* An array of all of the processed relations on an object
 	* @var	array
-	* @access	public
 	*/
-	var $relations = array();
+	public $relations = array();
 	
 	/**
 	* WHERE condition
 	* @var	string
-	* @access	private
 	*/
-	var $condition = '';
+	private $condition = '';
 	
 	/**
 	* The object table row; a fetched row that represents this instance
 	* @var	array
-	* @access	public
 	*/
-	var $objdata = array();
+	public $objdata = array();
 	
 	/**
 	* Insert ID from the insert() command
 	* @var	integer
-	* @access	public
 	*/
-	var $insertid = 0;
+	public $insertid = 0;
 	
 	/**
 	* Pre- and post-action method stoppers
 	* @var	array
-	* @access	public
 	*/
-	var $norunners = array();
+	public $norunners = array();
 	
 	/**
 	* The relations to execute on
 	* @var	array
-	* @access	public
 	*/
-	var $dorelations = array('fetch');
+	public $dorelations = array('fetch');
 	
 	/**
 	* Error list that has been generated
 	* @var	array
-	* @access	private
 	*/
-	var $errors = array();
+	private $errors = array();
 	
 	// ###################################################################
 	/**
diff --git a/date.php b/date.php
index d663412..528a23d 100644
--- a/date.php
+++ b/date.php
@@ -49,44 +49,38 @@ class Date
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* User timezone offset
 	* @var	integer
-	* @access	public
 	*/
-	var $usertz = 0;
+	public $usertz = 0;
 	
 	/**
 	* Server's timezone offset; this is set using fetch_offset()
 	* @var	integer
-	* @access	private
 	*/
-	var $servertz = 0;
+	private $servertz = 0;
 	
 	/**
 	* Total offset timezone; this is set using fetch_offset()
 	* @var	integer
-	* @access	private
 	*/
-	var $offsettz = 0;
+	private $offsettz = 0;
 	
 	/**
 	* Offset in seconds; this is set using fetch_offset()
 	* @var	integer
-	* @access	private
 	*/
-	var $offset = 0;
+	private $offset = 0;
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'usertz'	=> array(REQ_NO,	null,	false)
 	);
 	
diff --git a/db.php b/db.php
index f7f5054..fc907d0 100644
--- a/db.php
+++ b/db.php
@@ -48,65 +48,56 @@ class DB_Abstract
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	protected
 	*/
-	var $registry = null;
+	protected $registry = null;
 	
 	/**
 	* Determines whether or not errors should be shown
 	* @var	bool
-	* @access	public
 	*/
-	var $showerrors = true;
+	public $showerrors = true;
 	
 	/**
 	* Current error number
 	* @var	integer
-	* @access	protected
 	*/
-	var $errnum = 0;
+	protected $errnum = 0;
 	
 	/**
 	* Description of current error
 	* @var	string
-	* @access	protected
 	*/
-	var $errstr = '';
+	protected $errstr = '';
 	
 	/**
 	* Currend open MySQL connexion
 	* @var	resource
-	* @access	protected
 	*/
-	var $dblink = null;
+	protected $dblink = null;
 	
 	/**
 	* Current query ID
 	* @var	integer
-	* @access	protected
 	*/
-	var $result = null;
+	protected $result = null;
 	
 	/**
 	* Current query string
 	* @var	string
-	* @access	protected
 	*/
-	var $querystr = '';
+	protected $querystr = '';
 	
 	/**
 	* History of all executed queryies
 	* @var	array
-	* @access	protected
 	*/
-	var $history = array();
+	protected $history = array();
 	
 	/**
 	* Command mapping list
 	* @var	array
-	* @access	protected
 	*/
-	var $commands = array(
+	protected $commands = array(
 		'pconnect'			=> '%server %user %password %database',
 		'connect'			=> '%server %user %password %database',
 		'query'				=> '%link %query',
diff --git a/db_mysql.php b/db_mysql.php
index bd9c39a..3109e37 100644
--- a/db_mysql.php
+++ b/db_mysql.php
@@ -45,9 +45,8 @@ class DB_MySQL extends DB_Abstract
 	/**
 	* Command mapping list
 	* @var	array
-	* @access	private
 	*/
-	var $commands = array(
+	private $commands = array(
 		'pconnect'			=> '$this->command_mysql_pconnect',
 		'connect'			=> '$this->command_mysql_connect',
 		'query'				=> '$this->command_mysql_query',
diff --git a/db_mysqli.php b/db_mysqli.php
index 8ea48a0..da2de7b 100644
--- a/db_mysqli.php
+++ b/db_mysqli.php
@@ -45,9 +45,8 @@ class DB_MySQLi extends DB_Abstract
 	/**
 	* Command mapping list
 	* @var	array
-	* @access	private
 	*/
-	var $commands = array(
+	private $commands = array(
 		'pconnect'			=> '$this->command_mysqli_connect',
 		'connect'			=> '$this->command_mysqli_connect',
 		'query'				=> 'mysqli_query',
diff --git a/db_postgresql.php b/db_postgresql.php
index 86a18a4..410f5dd 100644
--- a/db_postgresql.php
+++ b/db_postgresql.php
@@ -45,9 +45,8 @@ class DB_PostgreSQL extends DB_Abstract
 	/**
 	* Command mapping list
 	* @var	array
-	* @access	private
 	*/
-	var $commands = array(
+	private $commands = array(
 		'pconnect'			=> '$this->command_pg_pconnect',
 		'connect'			=> '$this->command_pg_connect',
 		'query'				=> 'pg_query',
@@ -68,16 +67,14 @@ class DB_PostgreSQL extends DB_Abstract
 	/**
 	* Port number to connect to
 	* @var	integer
-	* @access	private
 	*/
-	var $port = 5432;
+	private $port = 5432;
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'port'		=> array(REQ_NO,	null,	true)
 	);
 	
diff --git a/functions.php b/functions.php
index c1b5bee..0fc5de9 100644
--- a/functions.php
+++ b/functions.php
@@ -43,44 +43,38 @@ class Functions
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* The path that is used to set cookies
 	* @var	string
-	* @access	private
 	*/
-	var $cookiepath = '/';
+	private $cookiepath = '/';
 	
 	/**
 	* The domain used for cookie setting
 	* @var	string
-	* @access	private
 	*/
-	var $cookiedom = '';
+	private $cookiedom = '';
 	
 	/**
 	* The time it takes for a cookie to expire
 	* @var	integer
-	* @access	private
 	*/
-	var $cookieexp = 900;
+	private $cookieexp = 900;
 	
 	/**
 	* State of the current background colour during alternation
 	* @var	string
-	* @access	public
 	*/
-	var $bgcolour = '';
+	public $bgcolour = '';
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'cookiepath'	=> array(REQ_YES,	null,	true),
 		'cookiedom'		=> array(REQ_YES,	null,	true),
 		'cookieexp'		=> array(REQ_YES,	null,	true)
diff --git a/graph_pie.php b/graph_pie.php
index e4732ac..21ebabf 100644
--- a/graph_pie.php
+++ b/graph_pie.php
@@ -43,45 +43,39 @@ class Graph_Pie
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Graphing data set; 2D array of
 	* array(NAME, PERCENT, COLOR)
 	* @var	array
-	* @access	private
 	*/
-	var $dataset = array();
+	private $dataset = array();
 	
 	/**
 	* Image resource
 	* @var	resource
-	* @access	private
 	*/
-	var $image = null;
+	private $image = null;
 	
 	/**
 	* The dimensions of the image
 	* @var	array
-	* @access	private
 	*/
-	var $dimensions = array('width' => 550, 'height' => 350);
+	private $dimensions = array('width' => 550, 'height' => 350);
 	
 	/**
 	* Add a legend to the graph
 	* @var	bool
-	* @access	private
 	*/
-	var $legend = true;
+	private $legend = true;
 	
 	/**
 	* Title of the graph
 	* @var	string
-	* @access	private
 	*/
-	var $title = 'ISSO Pie Chart';
+	private $title = 'ISSO Pie Chart';
 	
 	// ###################################################################
 	/**
diff --git a/kernel.php b/kernel.php
index cab6c2e..d413c9e 100644
--- a/kernel.php
+++ b/kernel.php
@@ -171,87 +171,75 @@ class ISSO
 	/**
 	* ISSO version
 	* @var	string
-	* @access	private
 	*/
-	var $version = '[#]issoversion[#]';
+	private $version = '[#]issoversion[#]';
 	
 	/**
 	* Location of ISSO, used for internal linking
 	* @var	string
-	* @access	private
 	*/
-	var $sourcepath = '';
+	private $sourcepath = '';
 	
 	/**
 	* Path of the current application
 	* @var	string
-	* @access	private
 	*/
-	var $apppath = '';
+	private $apppath = '';
 	
 	/**
 	* Web path used to get the web location of the installation of ISSO; only used for Printer module
 	* @var	string
-	* @access	private
 	*/
-	var $webpath = '';
+	private $webpath = '';
 	
 	/**
 	* Name of the current application
 	* @var	string
-	* @access	private
 	*/
-	var $application = '';
+	private $application = '';
 	
 	/**
 	* Version of the current application
 	* @var	string
-	* @access	private
 	*/
-	var $appversion = '';
+	private $appversion = '';
 	
 	/**
 	* Whether debug mode is on or off
 	* @var	bool
-	* @access	private
 	*/
-	var $debug = false;
+	private $debug = false;
 	
 	/**
 	* List of all active debug messages
 	* @var	array
-	* @access	private
 	*/
-	var $debuginfo = array();
+	private $debuginfo = array();
 	
 	/**
 	* List of loaded modules
 	* @var	array
-	* @access	private
 	*/
-	var $modules = array();
+	private $modules = array();
 	
 	/**
 	* An array of sanitized variables that have been cleaned for HTML tag openers and double quotes
 	* @var	array
-	* @access	public
 	*/
-	var $in = array();
+	public $in = array();
 	
 	/**
 	* If we are running with magic_quotes_gpc on or off
 	* @var	int
-	* @access	private
 	*/
-	var $magicquotes = 0;
+	private $magicquotes = 0;
 	
 	/**
 	* Array of user-specified fields that are required for ISSO initialization
 	* fieldname => array(REQUIRED, CALLBACK PARSER, SET)
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'sourcepath'	=> array(REQ_YES,	'fetch_sourcepath', false),
 		'apppath'		=> array(REQ_YES,	'fetch_sourcepath',	false),
 		'webpath'		=> array(REQ_NO,	'fetch_sourcepath',	false),
diff --git a/localize.php b/localize.php
index b0480e2..e64250b 100644
--- a/localize.php
+++ b/localize.php
@@ -52,23 +52,20 @@ class Localize
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Localization table
 	* @var	array
-	* @access	private
 	*/
-	var $localtable = array();
+	private $localtable = array();
 	
 	/**
 	* The lex lookup table
 	* @var	array
-	* @access	private
 	*/
-	var $lextable = array();
+	private $lextable = array();
 	
 	// ###################################################################
 	/**
diff --git a/mail.php b/mail.php
index 605e67a..2427cd9 100644
--- a/mail.php
+++ b/mail.php
@@ -43,86 +43,74 @@ class Mail
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* The message recipient's email address in the form of array(email => name)
 	* @var	array
-	* @access	private
 	*/
-	var $to = array();
+	private $to = array();
 	
 	/**
 	* The subject of the message
 	* @var	string
-	* @access	private
 	*/
-	var $subject = '';
+	private $subject = '';
 	
 	/**
 	* Body plain-text of the message
 	* @var	string
-	* @access	private
 	*/
-	var $bodytext = '';
+	private $bodytext = '';
 	
 	/**
 	* HTML multi-part body of the message
 	* @var	string
-	* @access	private
 	*/
-	var $bodyhtml = '';
+	private $bodyhtml = '';
 	
 	/**
 	* The message sender's email address
 	* @var	string
-	* @access	private
 	*/
-	var $from = '';
+	private $from = '';
 	
 	/**
 	* The message sender's display name
 	* @var	string
-	* @access	private
 	*/
-	var $fromname = '';
+	private $fromname = '';
 	
 	/**
 	* Additional message headers
 	* @var	string
-	* @access	private
 	*/
-	var $headers = '';
+	private $headers = '';
 	
 	/**
 	* Whether to send the message as HTML or plain-text
 	* @var	bool
-	* @access	private
 	*/
-	var $sendhtml = false;
+	private $sendhtml = false;
 	
 	/**
 	* The new line delimiter used in the message
 	* @var	string
-	* @access	private
 	*/
-	var $delim = "\n";
+	private $delim = "\n";
 	
 	/**
 	* Character set used to send messages with
 	* @var	string
-	* @access	public
 	*/
-	var $charset = 'utf-8'; // should we be using iso-8859-1 ?
+	public $charset = 'utf-8'; // should we be using iso-8859-1 ?
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'subject'	=> array(REQ_YES,	null,	false),
 		'bodytext'	=> array(REQ_YES,	null,	false),
 		'bodyhtml'	=> array(REQ_NO,	null,	false),
diff --git a/pagination.php b/pagination.php
index 8189185..32abe24 100644
--- a/pagination.php
+++ b/pagination.php
@@ -49,72 +49,62 @@ class Pagination
 	/**
 	* Current page number
 	* @var	integer
-	* @access	private
 	*/
-	var $page;
+	private $page;
 	
 	/**
 	* Per-page value
 	* @var	integer
-	* @access	private
 	*/
-	var $perpage;
+	private $perpage;
 	
 	/**
 	* Number of page links
 	* @var	integer
-	* @access	private
 	*/
-	var $pagelinks;
+	private $pagelinks;
 	
 	/**
 	* Total number of results
 	* @var	integer
-	* @access	private
 	*/
-	var $total;
+	private $total;
 	
 	/**
 	* Total number of pages
 	* @var	integer
-	* @access	private
 	*/
-	var $pagecount;
+	private $pagecount;
 	
 	/**
 	* Name of page variable
 	* @var	array
-	* @access	private
 	*/
-	var $pagevar;
+	private $pagevar;
 	
 	/**
 	* Name of per-page variable
 	* @var	integer
-	* @access	private
 	*/
-	var $perpagevar;
+	private $perpagevar;
 	
 	/**
 	* Maximum number of per-page results
 	* @var	integer
-	* @access	private
 	*/
-	var $maxperpage = 100;
+	private $maxperpage = 100;
 	
 	/**
 	* Default number of per-page results
 	* @var	integer
-	* @access	private
 	*/
-	var $defaultperpage = 20;
+	private $defaultperpage = 20;
 	
 	/**
 	* ISSO fields
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'total'				=> array(REQ_YES,	null,	false),
 		'pagelinks'			=> array(REQ_YES,	null,	false),
 		'pagevar'			=> array(REQ_YES,	null,	false),
diff --git a/printer.php b/printer.php
index 355e7d9..c173a6a 100644
--- a/printer.php
+++ b/printer.php
@@ -54,44 +54,38 @@ class Printer
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Realm that we are operating in (displayed in the <title>)
 	* @var	string
-	* @access	private
 	*/
-	var $realm = '[UNDEFINED REALM]';
+	private $realm = '[UNDEFINED REALM]';
 	
 	/**
 	* CSS to place in the page
 	* @var	string
-	* @access	private
 	*/
-	var $css = '';
+	private $css = '';
 	
 	/**
 	* Extra code to place
 	* @var	sring
-	* @access	private
 	*/
-	var $code = '';
+	private $code = '';
 	
 	/**
 	* Page-start hooko
 	* @var	string
-	* @access	private
 	*/
-	var $page_start_hook = ':=NO METHOD=:';
+	private $page_start_hook = ':=NO METHOD=:';
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'realm'				=> array(REQ_YES,	null,	false),
 		'page_start_hook'	=> array(REQ_NO,	null,	false)
 	);
diff --git a/printer_css.php b/printer_css.php
index 4c22780..af2c0b0 100644
--- a/printer_css.php
+++ b/printer_css.php
@@ -47,37 +47,32 @@ class Printer_CSS
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* CSS block list
 	* @var	array
-	* @access	private
 	*/
-	var $descriptors = array();
+	private $descriptors = array();
 	
 	/**
 	* Master data set
 	* @var	array
-	* @access	private
 	*/
-	var $masterdata = array();
+	private $masterdata = array();
 	
 	/**
 	* Cutomized data set
 	* @var	array
-	* @access	private
 	*/
-	var $customdata = array();
+	private $customdata = array();
 	
 	/**
 	* Valid properties that can be used in CSS
 	* @var	array
-	* @access	private
 	*/
-	var $properties = array(
+	private $properties = array(
 		'background'		=> 'background',
 		'color'				=> 'color',
 		'font-style'		=> 'font_style',
@@ -89,16 +84,14 @@ class Printer_CSS
 	/**
 	* Hook ran in fetch_modified_link; takes three params: $descriptor, $property, $name
 	* @var	string
-	* @access	private
 	*/
-	var $fetch_modified_link_hook = ':=NO METHOD=:';
+	private $fetch_modified_link_hook = ':=NO METHOD=:';
 	
 	/**
 	* Module fields
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'fetch_modified_link_hook'	=> array(REQ_YES,	null,	false)
 	);
 	
diff --git a/printer_navigation.php b/printer_navigation.php
index a5f19bb..0996714 100644
--- a/printer_navigation.php
+++ b/printer_navigation.php
@@ -45,44 +45,38 @@ class Printer_Navigation
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Global links that are used for admin home, logout, etc.
 	* @var	array
-	* @access	private
 	*/
-	var $toplinks = array();
+	private $toplinks = array();
 	
 	/**
 	* Navigational tabs: array(text, url)
 	* @var	array
-	* @access	private
 	*/
-	var $tabs = array();
+	private $tabs = array();
 	
 	/**
 	* Sections: text
 	* @var	array
-	* @access	private
 	*/
-	var $sections = array();
+	private $sections = array();
 	
 	/**
 	* Links: array(text, url)
 	* @var	array
-	* @access	private
 	*/
-	var $links = array();
+	private $links = array();
 	
 	/**
 	* Array of scopes to set focus to key
 	* @var	array
-	* @access	private
 	*/
-	var $focus = array('tab' => null, 'link' => null);
+	private $focus = array('tab' => null, 'link' => null);
 	
 	// ###################################################################
 	/**
diff --git a/template.php b/template.php
index 80f1c4e..abc89e3 100644
--- a/template.php
+++ b/template.php
@@ -47,93 +47,80 @@ class Template
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Name of the database table templates are in
 	* @var	string
-	* @access	private
 	*/
-	var $tablename = '';
+	private $tablename = '';
 	
 	/**
 	* Name of the table column template names are in
 	* @var	string
-	* @access	private
 	*/
-	var $namecolumn = '';
+	private $namecolumn = '';
 	
 	/**
 	* Name of the table column templates are in
 	* @var	string
-	* @access	private
 	*/
-	var $datacolumn = '';
+	private $datacolumn = '';
 	
 	/**
 	* Additional WHERE clauses for the template fetch SQL
 	* @var	string
-	* @access	private
 	*/
-	var $extrawhere = '';
+	private $extrawhere = '';
 	
 	/**
 	* The name of the function phrases are fetched with
 	* @var	string
-	* @access	private
 	*/
-	var $langcall = '$GLOBALS[\'isso:callback\']->modules[\'localize\']->string';
+	private $langcall = '$GLOBALS[\'isso:callback\']->modules[\'localize\']->string';
 	
 	/**
 	* The name of the function phrases are sprintf() parsed with
 	* @var	string
-	* @access	private
 	*/
-	var $langconst = 'sprintf';
+	private $langconst = 'sprintf';
 	
 	/**
 	* Array of pre-compiled templates that are stored to decrease server load
 	* @var	array
-	* @access	private
 	*/
-	var $cache = array();
+	private $cache = array();
 	
 	/**
 	* A list of the number of times each template has been used
 	* @var	array
-	* @access	private
 	*/
-	var $usage = array();
+	private $usage = array();
 	
 	/**
 	* A list of templates that weren't cached, but are still used
 	* @var	array
-	* @access	private
 	*/
-	var $uncached = array();
+	private $uncached = array();
 	
 	/**
 	* Whether or not the page has been flush()'d already
 	* @var	bool
-	* @access	private
 	*/
-	var $doneflush = false;
+	private $doneflush = false;
 	
 	/**
 	* The name of a function that is called before template parsing of phrases and conditionals occurs
 	* @var	string
-	* @access	private
 	*/
-	var $pre_parse_hook = ':=NO METHOD=:';
+	private $pre_parse_hook = ':=NO METHOD=:';
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'tablename'			=> array(REQ_YES,	null,	false),
 		'namecolumn'		=> array(REQ_YES,	null,	false),
 		'datacolumn'		=> array(REQ_YES,	null,	false),
diff --git a/template_fs.php b/template_fs.php
index d860517..e2233a6 100644
--- a/template_fs.php
+++ b/template_fs.php
@@ -45,23 +45,20 @@ class Template_FS extends Template
 	/**
 	* The path, from the path of the application, where templates are stored
 	* @var	string
-	* @access	private
 	*/
-	var $templatedir = '';
+	private $templatedir = '';
 	
 	/**
 	* The extension all the template files have
 	* @var	string
-	* @access	private
 	*/
-	var $extension = 'tpl';
+	private $extension = 'tpl';
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'templatedir'		=> array(REQ_YES,	'fetch_sourcepath',	false),
 		'extension'			=> array(REQ_YES,	null,				false),
 		'pre_parse_hook'	=> array(REQ_NO,	null,	false)
diff --git a/xml.php b/xml.php
index 478e7cb..f601000 100644
--- a/xml.php
+++ b/xml.php
@@ -42,58 +42,50 @@ class XML
 	/**
 	* Framework registry object
 	* @var	object
-	* @access	private
 	*/
-	var $registry = null;
+	private $registry = null;
 	
 	/**
 	* Parser resource
 	* @var	integer
-	* @access	private
 	*/
-	var $parser = null;
+	private $parser = null;
 	
 	/**
 	* An array of function names that are to be executed for each tag name (name => function)
 	* @var	array()
-	* @access	private
 	*/
-	var $taghandler = array();
+	private $taghandler = array();
 	
 	/**
 	* Current CDATA value
 	* @var	string
-	* @access	private
 	*/
-	var $cdata = '';
+	private $cdata = '';
 	
 	/**
 	* Tag stack of all open nodes
 	* @var	array
-	* @access	private
 	*/
-	var $stack = array();
+	private $stack = array();
 	
 	/**
 	* Node list for all open tag attributes
 	* @var	array
-	* @access	private
 	*/
-	var $attribs = array();
+	private $attribs = array();
 	
 	/**
 	* Resulting parsed array
 	* @var	array
-	* @access	private
 	*/
-	var $result = array();
+	private $result = array();
 	
 	/**
 	* Fields array that is used in this module
 	* @var	array
-	* @access	private
 	*/
-	var $fields = array(
+	private $fields = array(
 		'taghandler'	=> array(REQ_NO,	null,	false)
 	);
 	
-- 
2.22.5