From 699ce3204207285a222e1fad8aa3089362674a0c Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 31 Dec 2005 08:54:37 +0000 Subject: [PATCH] Give all the instance variables visibility tags --- api.php | 22 ++++++++++------------ date.php | 5 +++++ db.php | 9 +++++++++ db_mysql.php | 1 + db_mysqli.php | 1 + db_postgresql.php | 2 ++ functions.php | 5 +++++ kernel.php | 12 ++++++++++++ localize.php | 3 +++ mail.php | 7 +++++++ printer.php | 3 +++ template.php | 12 ++++++++++++ template_fs.php | 2 ++ xml.php | 7 +++++++ 14 files changed, 79 insertions(+), 12 deletions(-) diff --git a/api.php b/api.php index 60d30c2..f5b013b 100644 --- a/api.php +++ b/api.php @@ -26,18 +26,8 @@ * @package ISSO */ -if (!defined('REQ_YES')) -{ - /** - * Yes, required - */ - define('REQ_YES', 1); - - /** - * No, not required - */ - define('REQ_NO', 0); - +if (!defined('REQ_AUTO')) +{ /** * Auto-increasing value */ @@ -82,6 +72,7 @@ class API /** * Registry object * @var object + * @access protected */ var $registry = null; @@ -89,42 +80,49 @@ class API * Fields: used for verification and sanitization * NAME => array(TYPE, REQUIRED, VERIFY METHOD (:self for self-named method)) * @var array + * @access protected */ var $fields = array(); /** * Values array: sanitized and verified field values * @var array + * @access public */ var $values = array(); /** * Fields that were manually set with set(), not by using set_existing() * @var array + * @access private */ var $setfields = array(); /** * WHERE condition * @var string + * @access private */ var $condition = ''; /** * The object table row; a fetched row that represents this instance * @var array + * @access public */ var $objdata = array(); /** * Insert ID from the insert() command * @var integer + * @access public */ var $insertid = 0; /** * Pre- and post-action method stoppers * @var array + * @access public */ var $norunners = array(); diff --git a/date.php b/date.php index 3d99726..17dce5a 100644 --- a/date.php +++ b/date.php @@ -49,30 +49,35 @@ class Date /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * User timezone offset * @var integer + * @access public */ var $usertz = 0; /** * Server's timezone offset; this is set using fetch_offset() * @var integer + * @access private */ var $servertz = 0; /** * Total offset timezone; this is set using fetch_offset() * @var integer + * @access private */ var $offsettz = 0; /** * Offset in seconds; this is set using fetch_offset() * @var integer + * @access private */ var $offset = 0; diff --git a/db.php b/db.php index 94e52b4..95671c8 100644 --- a/db.php +++ b/db.php @@ -47,54 +47,63 @@ class DB_Abstract /** * Framework registry object * @var object + * @access protected */ var $registry = null; /** * Determines whether or not errors should be shown * @var bool + * @access public */ var $showerrors = true; /** * Current error number * @var integer + * @access protected */ var $errnum = 0; /** * Description of current error * @var string + * @access protected */ var $errstr = ''; /** * Currend open MySQL connexion * @var resource + * @access protected */ var $dblink = null; /** * Current query ID * @var integer + * @access protected */ var $result = null; /** * Current query string * @var string + * @access protected */ var $querystr = ''; /** * History of all executed queryies * @var array + * @access protected */ var $history = array(); /** * Command mapping list * @var array + * @access protected */ var $commands = array( 'pconnect' => '%server %user %password %database', diff --git a/db_mysql.php b/db_mysql.php index 05455fe..1f13c3a 100644 --- a/db_mysql.php +++ b/db_mysql.php @@ -45,6 +45,7 @@ class DB_MySQL extends DB_Abstract /** * Command mapping list * @var array + * @access private */ var $commands = array( 'pconnect' => '$this->command_mysql_pconnect', diff --git a/db_mysqli.php b/db_mysqli.php index c757cbe..07ee188 100644 --- a/db_mysqli.php +++ b/db_mysqli.php @@ -45,6 +45,7 @@ class DB_MySQLi extends DB_Abstract /** * Command mapping list * @var array + * @access private */ var $commands = array( 'pconnect' => '$this->command_mysqli_connect', diff --git a/db_postgresql.php b/db_postgresql.php index ae66a1a..ff340a2 100644 --- a/db_postgresql.php +++ b/db_postgresql.php @@ -45,6 +45,7 @@ class DB_PostgreSQL extends DB_Abstract /** * Command mapping list * @var array + * @access private */ var $commands = array( 'pconnect' => '$this->command_pg_pconnect', @@ -64,6 +65,7 @@ class DB_PostgreSQL extends DB_Abstract /** * Port number to connect to * @var integer + * @access public */ var $port = 5432; diff --git a/functions.php b/functions.php index a175329..4ff2cde 100644 --- a/functions.php +++ b/functions.php @@ -43,30 +43,35 @@ class Functions /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * The path that is used to set cookies * @var string + * @access public */ var $cookiepath = '/'; /** * The domain used for cookie setting * @var string + * @access public */ var $cookiedom = ''; /** * The time it takes for a cookie to expire * @var integer + * @access public */ var $cookieexp = 900; /** * State of the current background colour during alternation * @var string + * @access public */ var $bgcolour = ''; diff --git a/kernel.php b/kernel.php index 823b896..32aad22 100644 --- a/kernel.php +++ b/kernel.php @@ -156,66 +156,77 @@ class Shared_Object_Framework /** * ISSO version * @var string + * @access private */ var $version = '[#]version[#]'; /** * Location of ISSO, used for internal linking * @var string + * @access private */ var $sourcepath = ''; /** * Path of the current application * @var string + * @access private */ var $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 = ''; /** * Name of the current application * @var string + * @access private */ var $application = ''; /** * Version of the current application * @var string + * @access private */ var $appversion = ''; /** * Whether debug mode is on or off * @var bool + * @access private */ var $debug = false; /** * List of all active debug messages * @var array + * @access private */ var $debuginfo = array(); /** * List of loaded modules * @var array + * @access private */ var $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(); /** * If we are running with magic_quotes_gpc on or off * @var int + * @access private */ var $magicquotes = 0; @@ -223,6 +234,7 @@ class Shared_Object_Framework * Array of user-specified fields that are required for ISSO initialization * fieldname => array(REQUIRED, CALLBACK PARSER, SET) * @var array + * @access private */ var $fields = array( 'sourcepath' => array(REQ_YES, 'fetch_sourcepath', false), diff --git a/localize.php b/localize.php index 414ca92..3c915ef 100644 --- a/localize.php +++ b/localize.php @@ -52,18 +52,21 @@ class Localize /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * Localization table * @var array + * @access private */ var $localtable = array(); /** * The lex lookup table * @var array + * @access private */ var $lextable = array(); diff --git a/mail.php b/mail.php index 2708cc6..0c60a10 100644 --- a/mail.php +++ b/mail.php @@ -43,42 +43,49 @@ class Mail /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * The message recipient's email address * @var string + * @access public */ var $to = ''; /** * The subject of the message * @var string + * @access public */ var $subject = ''; /** * Body of the message * @var string + * @access public */ var $body = ''; /** * The message sender's email address * @var string + * @access public */ var $from = ''; /** * The message sender's display name * @var string + * @access public */ var $fromname = ''; /** * Additional message headers * @var string + * @access public */ var $headers = ''; diff --git a/printer.php b/printer.php index 4cbb7c4..5a59ce7 100644 --- a/printer.php +++ b/printer.php @@ -53,18 +53,21 @@ class Printer /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * Realm that we are operating in (displayed in the ) * @var string + * @access public */ var $realm = '[UNDEFINED REALM]'; /** * CSS to place in the page * @var string + * @access private */ var $css = ''; diff --git a/template.php b/template.php index 1583fb5..204445d 100644 --- a/template.php +++ b/template.php @@ -47,72 +47,84 @@ class Template /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * Name of the database table templates are in * @var string + * @access public */ var $tablename = ''; /** * Name of the table column template names are in * @var string + * @access public */ var $namecolumn = ''; /** * Name of the table column templates are in * @var string + * @access public */ var $datacolumn = ''; /** * Additional WHERE clauses for the template fetch SQL * @var string + * @access public */ var $extrawhere = ''; /** * The name of the function phrases are fetched with * @var string + * @access public */ var $langcall = '$GLOBALS[\'isso:null-framework\']->modules[\'localize\']->string'; /** * The name of the function phrases are sprintf() parsed with * @var string + * @access public */ var $langconst = 'sprintf'; /** * Array of pre-compiled templates that are stored to decrease server load * @var array + * @access private */ var $cache = array(); /** * A list of the number of times each template has been used * @var array + * @access private */ var $usage = array(); /** * A list of templates that weren't cached, but are still used * @var array + * @access private */ var $uncached = array(); /** * Whether or not the page has been flush()'d already * @var bool + * @access private */ var $doneflush = false; /** * The name of a function that is called before template parsing of phrases and conditionals occurs * @var string + * @access public */ var $pre_parse_hook = ':=NO METHOD=:'; diff --git a/template_fs.php b/template_fs.php index 0974bd5..838f5d9 100644 --- a/template_fs.php +++ b/template_fs.php @@ -45,12 +45,14 @@ class Template_FS extends Template /** * The path, from the path of the application, where templates are stored * @var string + * @access public */ var $templatedir = ''; /** * The extension all the template files have * @var string + * @access public */ var $extension = 'tpl'; diff --git a/xml.php b/xml.php index 3f8010c..5605a67 100644 --- a/xml.php +++ b/xml.php @@ -42,42 +42,49 @@ class XML /** * Framework registry object * @var object + * @access private */ var $registry = null; /** * Parser resource * @var integer + * @access private */ var $parser = null; /** * An array of function names that are to be executed for each tag name (name => function) * @var array() + * @access public */ var $taghandler = array(); /** * Current CDATA value * @var string + * @access private */ var $cdata = ''; /** * Tag stack of all open nodes * @var array + * @access private */ var $stack = array(); /** * Node list for all open tag attributes * @var array + * @access private */ var $attribs = array(); /** * Resulting parsed array * @var array + * @access private */ var $result = array(); -- 2.22.5