[geeklog-cvs] MVCnPHP ArrayLoader.class.php,1.1.1.1,1.1.1.1.2.1 BaseCommand.class.php,1.1.1.1,1.1.1.1.2.1 BaseLoader.class.php,1.2,1.2.2.1 BaseView.class.php,1.1.1.1,1.1.1.1.2.1 CommandFactory.class.php,1.1.1.1,1.1.1.1.2.1 Controller.class.php,1.4,1.4.2.1 Form.class.php,1.2,1.2.2.1 MVC_Base.class.php,1.1.1.1,1.1.1.1.2.1 MVC_XMLParser.class.php,1.2,1.2.2.1 Mapping.class.php,1.1.1.1,1.1.1.1.2.1 QF_View.class.php,1.3,1.3.2.1 Validator.class.php,1.2,1.2.2.1 ViewFactory.class.php,1.1.1.1,1.1.1.1.2.1 XMLLoader.class.php,1.3,1.3.2.1
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Fri Jul 18 14:56:06 EDT 2003
Update of /usr/cvs/geeklog/MVCnPHP
In directory internal.geeklog.net:/tmp/cvs-serv20462
Modified Files:
Tag: rel-1-0-php5-port
ArrayLoader.class.php BaseCommand.class.php
BaseLoader.class.php BaseView.class.php
CommandFactory.class.php Controller.class.php Form.class.php
MVC_Base.class.php MVC_XMLParser.class.php Mapping.class.php
QF_View.class.php Validator.class.php ViewFactory.class.php
XMLLoader.class.php
Log Message:
Ported most classes to PHP5, not using exceptions yet. This has not been tested.
Index: ArrayLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/ArrayLoader.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** ArrayLoader.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- ArrayLoader.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 37,41 ****
* @var array
*/
! var $_arrayData = null;
/**
--- 37,41 ----
* @var array
*/
! private $_arrayData = null;
/**
***************
*** 53,57 ****
*
*/
! function &getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
if (!is_array($arrayData) AND !is_array($this->_arrayData)) {
--- 53,57 ----
*
*/
! public function getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
if (!is_array($arrayData) AND !is_array($this->_arrayData)) {
Index: BaseCommand.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseCommand.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** BaseCommand.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- BaseCommand.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 26,41 ****
*
*/
! class BaseCommand extends MVC_Base {
! /**
! * Constructor
! *
! * @author Tony Bibbs <tony at geeklog.net>
! * @access public
! *
! */
! function BaseCommand()
! {
! }
!
/**
* Executes this command
--- 26,30 ----
*
*/
! abstract class BaseCommand extends MVC_Base {
/**
* Executes this command
***************
*** 46,52 ****
*
*/
! function execute()
! {
! }
}
--- 35,39 ----
*
*/
! abstract public function execute();
}
Index: BaseLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseLoader.class.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** BaseLoader.class.php 14 Jul 2003 16:39:27 -0000 1.2
--- BaseLoader.class.php 18 Jul 2003 18:56:04 -0000 1.2.2.1
***************
*** 35,39 ****
*
*/
! class BaseLoader {
/**
* Constructor
--- 35,39 ----
*
*/
! abstract class BaseLoader {
/**
* Constructor
***************
*** 43,47 ****
*
*/
! function BaseLoader()
{
}
--- 43,47 ----
*
*/
! function __construct()
{
}
***************
*** 58,62 ****
*
*/
! function &getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
$mapping = new Mapping();
--- 58,62 ----
*
*/
! public function getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
$mapping = new Mapping();
***************
*** 88,92 ****
*
*/
! function _getDefaultMapping()
{
foreach ($this->_arrayData[MVC_VIEWS] as $curView) {
--- 88,92 ----
*
*/
! private function _getDefaultMapping()
{
foreach ($this->_arrayData[MVC_VIEWS] as $curView) {
***************
*** 108,112 ****
*
*/
! function _getForwards($name)
{
return $this->_arrayData[MVC_MODELS][$name][MVC_FORWARDS];
--- 108,112 ----
*
*/
! private function _getForwards($name)
{
return $this->_arrayData[MVC_MODELS][$name][MVC_FORWARDS];
Index: BaseView.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseView.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** BaseView.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- BaseView.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 26,35 ****
*
*/
! class BaseView extends MVC_Base {
/**
* @access private
* @var int
*/
! var $_outputMethod = MVC_PRINT;
/**
--- 26,35 ----
*
*/
! abstract class BaseView extends MVC_Base {
/**
* @access private
* @var int
*/
! private $_outputMethod = MVC_PRINT;
/**
***************
*** 45,49 ****
*
*/
! function printView()
{
if ($this->_outputMethod == MVC_PRINT) {
--- 45,49 ----
*
*/
! public function printView()
{
if ($this->_outputMethod == MVC_PRINT) {
***************
*** 65,69 ****
*
*/
! function setOutputMethod($method)
{
if ($method == MVC_PRINT) {
--- 65,69 ----
*
*/
! public function setOutputMethod($method)
{
if ($method == MVC_PRINT) {
***************
*** 83,89 ****
*
*/
! function getView()
! {
! }
}
--- 83,88 ----
*
*/
! abstract public function getView();
!
}
Index: CommandFactory.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/CommandFactory.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** CommandFactory.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- CommandFactory.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 38,42 ****
*
*/
! function &getCommand($path, $name)
{
if (empty($name)) {
--- 38,42 ----
*
*/
! public function getCommand($path, $name)
{
if (empty($name)) {
Index: Controller.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Controller.class.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** Controller.class.php 14 Jul 2003 16:40:14 -0000 1.4
--- Controller.class.php 18 Jul 2003 18:56:04 -0000 1.4.2.1
***************
*** 59,63 ****
* @var int
*/
! var $_allowedFormMethod = null;
/**
--- 59,63 ----
* @var int
*/
! private $_allowedFormMethod = null;
/**
***************
*** 65,69 ****
* @var array
*/
! var $_request = null;
/**
--- 65,69 ----
* @var array
*/
! private $_request = null;
/**
***************
*** 71,75 ****
* @var string
*/
! var $_object = null;
/**
--- 71,75 ----
* @var string
*/
! private $_object = null;
/**
***************
*** 77,81 ****
* @var object
*/
! var $_mapLoader = null;
/**
--- 77,81 ----
* @var object
*/
! private $_mapLoader = null;
/**
***************
*** 83,87 ****
* @var object
*/
! var $_mapping = null;
/**
--- 83,87 ----
* @var object
*/
! private $_mapping = null;
/**
***************
*** 89,93 ****
* @var string
*/
! var $_mvcBase = null;
/**
--- 89,93 ----
* @var string
*/
! private $_mvcBase = null;
/**
***************
*** 95,99 ****
* @var string
*/
! var $_viewDir = null;
/**
--- 95,99 ----
* @var string
*/
! private $_viewDir = null;
/**
***************
*** 101,105 ****
* @var string
*/
! var $_commandDir = null;
/**
--- 101,105 ----
* @var string
*/
! private $_commandDir = null;
/**
***************
*** 107,111 ****
* @var string
*/
! var $_baseURL = null;
/**
--- 107,111 ----
* @var string
*/
! private $_baseURL = null;
/**
***************
*** 113,117 ****
* @var int
*/
! var $_configType = null;
/**
--- 113,117 ----
* @var int
*/
! private $_configType = null;
/**
***************
*** 119,123 ****
* @var array
*/
! var $_configData = null;
/**
--- 119,123 ----
* @var array
*/
! private $_configData = null;
/**
***************
*** 134,138 ****
*
*/
! function Controller($configData, $configType = MVC_XML, $allowedFormMethod = MVC_BOTH)
{
$this->_clearMessages();
--- 134,138 ----
*
*/
! function __construct($configData, $configType = MVC_XML, $allowedFormMethod = MVC_BOTH)
{
$this->_clearMessages();
***************
*** 168,172 ****
*
*/
! function setMVCBase($path)
{
if (!is_dir($path)) {
--- 168,172 ----
*
*/
! public function setMVCBase($path)
{
if (!is_dir($path)) {
***************
*** 187,191 ****
*
*/
! function setViewDir($path)
{
if (!is_dir($path)) {
--- 187,191 ----
*
*/
! public function setViewDir($path)
{
if (!is_dir($path)) {
***************
*** 205,209 ****
*
*/
! function setCommandDir($path)
{
if (!is_dir($path)) {
--- 205,209 ----
*
*/
! public function setCommandDir($path)
{
if (!is_dir($path)) {
***************
*** 225,229 ****
*
*/
! function setBaseURL($url)
{
$this->_baseURL = $url;
--- 225,229 ----
*
*/
! public function setBaseURL($url)
{
$this->_baseURL = $url;
***************
*** 238,242 ****
*
*/
! function processRequest()
{
// Ensure user isn't submitted data via an illegal method
--- 238,242 ----
*
*/
! public function processRequest()
{
// Ensure user isn't submitted data via an illegal method
***************
*** 248,252 ****
if ($this->_mapping->getType() == 'view') {
require_once 'ViewFactory.class.php';
! $view = &ViewFactory::getView($this->_mapping->getPath(), $this->_mapping->getName());
$retval = $view->getView();
if ($this->_isForward($retval)) {
--- 248,252 ----
if ($this->_mapping->getType() == 'view') {
require_once 'ViewFactory.class.php';
! $view = ViewFactory::getView($this->_mapping->getPath(), $this->_mapping->getName());
$retval = $view->getView();
if ($this->_isForward($retval)) {
***************
*** 258,262 ****
} else {
require_once 'CommandFactory.class.php';
! $tmp = &CommandFactory::getCommand($this->_mapping->getPath(), $this->_mapping->getName());
$strForward = $tmp->execute();
// This IF is required to avoid errors using quickform
--- 258,262 ----
} else {
require_once 'CommandFactory.class.php';
! $tmp = CommandFactory::getCommand($this->_mapping->getPath(), $this->_mapping->getName());
$strForward = $tmp->execute();
// This IF is required to avoid errors using quickform
***************
*** 280,284 ****
*
*/
! function _clearMessages()
{
unset($_SESSION[MVC_MESSAGE]);
--- 280,284 ----
*
*/
! private function _clearMessages()
{
unset($_SESSION[MVC_MESSAGE]);
***************
*** 293,297 ****
*
*/
! function _checkMethod()
{
$errors = Array();
--- 293,297 ----
*
*/
! private function _checkMethod()
{
$errors = Array();
***************
*** 322,329 ****
*
*/
! function _loadMapping($configType, $configData)
{
if (empty($this->_mapLoader)) {
! $this->_mapLoader = &LoaderFactory::getLoader($configType);
}
--- 322,329 ----
*
*/
! private function _loadMapping($configType, $configData)
{
if (empty($this->_mapLoader)) {
! $this->_mapLoader = LoaderFactory::getLoader($configType);
}
***************
*** 344,348 ****
*
*/
! function _isForward($name)
{
if ($this->_mapping->getForward($name)) {
--- 344,348 ----
*
*/
! private function _isForward($name)
{
if ($this->_mapping->getForward($name)) {
***************
*** 366,370 ****
*
*/
! function _forwardControl($name)
{
$forward = $this->_mapping->getForward($name);
--- 366,370 ----
*
*/
! private function _forwardControl($name)
{
$forward = $this->_mapping->getForward($name);
Index: Form.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Form.class.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Form.class.php 6 Apr 2003 17:41:56 -0000 1.2
--- Form.class.php 18 Jul 2003 18:56:04 -0000 1.2.2.1
***************
*** 32,36 ****
* @var array
*/
! var $_values = null;
/**
--- 32,36 ----
* @var array
*/
! private $_values = null;
/**
***************
*** 42,46 ****
*
*/
! function Form($formArray)
{
$this->_values = $formArray;
--- 42,46 ----
*
*/
! public function __construct($formArray)
{
$this->_values = $formArray;
***************
*** 56,60 ****
*
*/
! function contains($varName)
{
return isset($this->_values[$varName]);
--- 56,60 ----
*
*/
! public function contains($varName)
{
return isset($this->_values[$varName]);
***************
*** 70,74 ****
*
*/
! function get($varName)
{
if (!$this->contains($varName)) {
--- 70,74 ----
*
*/
! public function get($varName)
{
if (!$this->contains($varName)) {
***************
*** 86,90 ****
*
*/
! function remove($varName)
{
if ($this->contains($varName)) {
--- 86,90 ----
*
*/
! public function remove($varName)
{
if ($this->contains($varName)) {
***************
*** 102,106 ****
*
*/
! function set($varName, $value)
{
$this->_values[$varName] = $value;
--- 102,106 ----
*
*/
! public function set($varName, $value)
{
$this->_values[$varName] = $value;
***************
*** 115,119 ****
*
*/
! function &getValues()
{
return $this->_values;
--- 115,119 ----
*
*/
! public function getValues()
{
return $this->_values;
Index: MVC_Base.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/MVC_Base.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** MVC_Base.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- MVC_Base.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 28,32 ****
*
*/
! class MVC_Base {
/**
* Constructor
--- 28,32 ----
*
*/
! abstract class MVC_Base {
/**
* Constructor
***************
*** 36,40 ****
*
*/
! function MVC_Base()
{
}
--- 36,40 ----
*
*/
! function __construct()
{
}
Index: MVC_XMLParser.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/MVC_XMLParser.class.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** MVC_XMLParser.class.php 14 Jul 2003 16:40:54 -0000 1.2
--- MVC_XMLParser.class.php 18 Jul 2003 18:56:04 -0000 1.2.2.1
***************
*** 34,38 ****
* @var array
*/
! var $_elements = null;
/**
--- 34,38 ----
* @var array
*/
! private $_elements = null;
/**
***************
*** 40,44 ****
* @var array
*/
! var $_attributes = null;
/**
--- 40,44 ----
* @var array
*/
! private $_attributes = null;
/**
***************
*** 46,50 ****
* @var array
*/
! var $_values = null;
/**
--- 46,50 ----
* @var array
*/
! private $_values = null;
/**
***************
*** 52,56 ****
* @var int
*/
! var $_curElement = null;
/**
--- 52,56 ----
* @var int
*/
! private $_curElement = null;
/**
***************
*** 58,62 ****
* @var int
*/
! var $_level = 0;
/**
--- 58,62 ----
* @var int
*/
! private $_level = 0;
/**
***************
*** 64,68 ****
* @var object
*/
! var $_parser = null;
/**
--- 64,68 ----
* @var object
*/
! private $_parser = null;
/**
***************
*** 78,82 ****
*
*/
! function MVC_XMLParser($xmlString = '')
{
$this->_elements = Array();
--- 78,82 ----
*
*/
! function __construct($xmlString = '')
{
$this->_elements = Array();
***************
*** 96,100 ****
*
*/
! function parseXML($xmlString)
{
// Create Expat parser object
--- 96,100 ----
*
*/
! public function parseXML($xmlString)
{
// Create Expat parser object
***************
*** 129,133 ****
*
*/
! function _handleStartElement($parser, $name, $attributes)
{
// This tidbit of code grabs the index into _elements for
--- 129,133 ----
*
*/
! private function _handleStartElement($parser, $name, $attributes)
{
// This tidbit of code grabs the index into _elements for
***************
*** 155,159 ****
*
*/
! function _handleEndElement()
{
$this->_level--;
--- 155,159 ----
*
*/
! private function _handleEndElement()
{
$this->_level--;
***************
*** 171,175 ****
*
*/
! function _handleData($parser, $data)
{
// NOTE: the use of trim() here is necessary as
--- 171,175 ----
*
*/
! private function _handleData($parser, $data)
{
// NOTE: the use of trim() here is necessary as
***************
*** 187,191 ****
*
*/
! function getTag($index)
{
return $this->_elements[$index];
--- 187,191 ----
*
*/
! public function getTag($index)
{
return $this->_elements[$index];
***************
*** 200,204 ****
*
*/
! function getElementIndexes()
{
return array_keys($this->_elements);
--- 200,204 ----
*
*/
! public function getElementIndexes()
{
return array_keys($this->_elements);
***************
*** 215,219 ****
*
*/
! function getAttribute($index, $attribute)
{
return $this->_attributes[$index][strtoupper($attribute)];
--- 215,219 ----
*
*/
! public function getAttribute($index, $attribute)
{
return $this->_attributes[$index][strtoupper($attribute)];
***************
*** 229,233 ****
*
*/
! function getValue($index)
{
return $this->_values[$index];
--- 229,233 ----
*
*/
! public function getValue($index)
{
return $this->_values[$index];
Index: Mapping.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Mapping.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** Mapping.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- Mapping.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 33,37 ****
* @var string
*/
! var $_name = null;
/**
--- 33,37 ----
* @var string
*/
! private $_name = null;
/**
***************
*** 39,43 ****
* @var string
*/
! var $_type = null;
/**
--- 39,43 ----
* @var string
*/
! private $_type = null;
/**
***************
*** 45,49 ****
* @var string
*/
! var $_typePath = null;
/**
--- 45,49 ----
* @var string
*/
! private $_typePath = null;
/**
***************
*** 51,55 ****
* @var string
*/
! var $_forwards = null;
/**
--- 51,55 ----
* @var string
*/
! private $_forwards = null;
/**
***************
*** 57,61 ****
* @var string
*/
! var $_baseURL = null;
/**
--- 57,61 ----
* @var string
*/
! private $_baseURL = null;
/**
***************
*** 67,71 ****
*
*/
! function setBaseURL($url)
{
$this->_baseURL = $url;
--- 67,71 ----
*
*/
! public function setBaseURL($url)
{
$this->_baseURL = $url;
***************
*** 82,86 ****
*
*/
! function getBaseURL()
{
return $this->_baseURL;
--- 82,86 ----
*
*/
! public function getBaseURL()
{
return $this->_baseURL;
***************
*** 96,100 ****
*
*/
! function setName($name)
{
$this->_name = $name;
--- 96,100 ----
*
*/
! public function setName($name)
{
$this->_name = $name;
***************
*** 110,114 ****
*
*/
! function getName()
{
return $this->_name;
--- 110,114 ----
*
*/
! public function getName()
{
return $this->_name;
***************
*** 123,127 ****
*
*/
! function setType($type)
{
$this->_type = $type;
--- 123,127 ----
*
*/
! public function setType($type)
{
$this->_type = $type;
***************
*** 136,140 ****
*
*/
! function getType()
{
return $this->_type;
--- 136,140 ----
*
*/
! public function getType()
{
return $this->_type;
***************
*** 150,154 ****
*
*/
! function setForwards($forwards)
{
$this->_forwards = $forwards;
--- 150,154 ----
*
*/
! public function setForwards($forwards)
{
$this->_forwards = $forwards;
***************
*** 164,168 ****
*
*/
! function getForward($name)
{
if (!empty($this->_forwards[$name])) {
--- 164,168 ----
*
*/
! public function getForward($name)
{
if (!empty($this->_forwards[$name])) {
***************
*** 181,185 ****
*
*/
! function setTypePath($path)
{
$this->_typePath = $path;
--- 181,185 ----
*
*/
! public function setTypePath($path)
{
$this->_typePath = $path;
***************
*** 195,199 ****
*
*/
! function getPath()
{
return $this->_typePath;
--- 195,199 ----
*
*/
! public function getPath()
{
return $this->_typePath;
Index: QF_View.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/QF_View.class.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** QF_View.class.php 2 May 2003 18:43:36 -0000 1.3
--- QF_View.class.php 18 Jul 2003 18:56:04 -0000 1.3.2.1
***************
*** 43,52 ****
*
*/
! class QF_View extends BaseView {
/**
* @access private
* @var HTML_QuickForm
*/
! var $_QForm = null;
/**
--- 43,52 ----
*
*/
! abstract class QF_View extends BaseView {
/**
* @access private
* @var HTML_QuickForm
*/
! protected $_QForm = null;
/**
***************
*** 59,63 ****
*
*/
! function QF_View()
{
$this->_QForm = new HTML_QuickForm();
--- 59,63 ----
*
*/
! function __construct()
{
$this->_QForm = new HTML_QuickForm();
***************
*** 73,77 ****
*
*/
! function _setQFormAttributes($formName='', $method='post', $action='')
{
$this->_QForm->HTML_QuickForm($formName, $method, $action);
--- 73,77 ----
*
*/
! protected function _setQFormAttributes($formName='', $method='post', $action='')
{
$this->_QForm->HTML_QuickForm($formName, $method, $action);
***************
*** 86,92 ****
*
*/
! function getView()
! {
! }
/**
--- 86,90 ----
*
*/
! abstract public function getView();
/**
***************
*** 101,105 ****
*
*/
! function execute()
{
$this->getView();
--- 99,103 ----
*
*/
! public function execute()
{
$this->getView();
Index: Validator.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Validator.class.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Validator.class.php 14 Jul 2003 16:41:10 -0000 1.2
--- Validator.class.php 18 Jul 2003 18:56:04 -0000 1.2.2.1
***************
*** 53,57 ****
*
*/
! function Validator()
{
$this->_form = new Form($_REQUEST);
--- 53,57 ----
*
*/
! function __construct()
{
$this->_form = new Form($_REQUEST);
***************
*** 70,74 ****
*
*/
! function contains($varName)
{
return $this->_form->contains($varName);
--- 70,74 ----
*
*/
! public function contains($varName)
{
return $this->_form->contains($varName);
***************
*** 86,90 ****
*
*/
! function get($varName)
{
return $this->_form->get($varName);
--- 86,90 ----
*
*/
! public function get($varName)
{
return $this->_form->get($varName);
***************
*** 101,105 ****
*
*/
! function remove($varName)
{
$this->_form->remove($varName);
--- 101,105 ----
*
*/
! public function remove($varName)
{
$this->_form->remove($varName);
***************
*** 117,121 ****
*
*/
! function set($varName, $value)
{
$this->_form->set($varName, $value);
--- 117,121 ----
*
*/
! public function set($varName, $value)
{
$this->_form->set($varName, $value);
***************
*** 132,136 ****
*
*/
! function &getValues()
{
return $this->_form->getValues();
--- 132,136 ----
*
*/
! public function getValues()
{
return $this->_form->getValues();
Index: ViewFactory.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/ViewFactory.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** ViewFactory.class.php 5 Apr 2003 20:00:52 -0000 1.1.1.1
--- ViewFactory.class.php 18 Jul 2003 18:56:04 -0000 1.1.1.1.2.1
***************
*** 38,42 ****
*
*/
! function &getView($path, $name)
{
$filename = $path . $name . '.class.php';
--- 38,42 ----
*
*/
! public function getView($path, $name)
{
$filename = $path . $name . '.class.php';
Index: XMLLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/XMLLoader.class.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** XMLLoader.class.php 14 Jul 2003 16:41:26 -0000 1.3
--- XMLLoader.class.php 18 Jul 2003 18:56:04 -0000 1.3.2.1
***************
*** 54,58 ****
*
*/
! function &getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
if (!file_exists($arrayData) AND !is_array($this->_arrayData)) {
--- 54,58 ----
*
*/
! public function getMapping($name, $viewsDir, $commandsDir, $baseURL, $arrayData = '')
{
if (!file_exists($arrayData) AND !is_array($this->_arrayData)) {
***************
*** 74,78 ****
*
*/
! function _XMLToArray($xmlData)
{
$parser = new MVC_XMLParser($xmlData);
--- 74,78 ----
*
*/
! private function _XMLToArray($xmlData)
{
$parser = new MVC_XMLParser($xmlData);
More information about the geeklog-cvs
mailing list