diff --git a/gulliver/system/class.dbconnection.php b/gulliver/system/class.dbconnection.php index 8af61cfb3..b6400743d 100644 --- a/gulliver/system/class.dbconnection.php +++ b/gulliver/system/class.dbconnection.php @@ -93,7 +93,7 @@ class DBConnection * @return string * */ - public function __construct($strServer = DB_HOST, $strUser = DB_USER, $strPwd = DB_PASS, $strDB = DB_NAME, $type = DB_ADAPTER, $strPort = 0, $errorLevel = 2) + public function DBConnection($strServer = DB_HOST, $strUser = DB_USER, $strPwd = DB_PASS, $strDB = DB_NAME, $type = DB_ADAPTER, $strPort = 0, $errorLevel = 2) { $this->errorLevel = $errorLevel; if ($type == null) { diff --git a/gulliver/system/class.dbrecordset.php b/gulliver/system/class.dbrecordset.php index d3caa950c..54a2d459a 100644 --- a/gulliver/system/class.dbrecordset.php +++ b/gulliver/system/class.dbrecordset.php @@ -47,9 +47,9 @@ class DBRecordSet * @param string $intResult Database recordset default value = false * @return void */ - public function __construct($intResult = null) + function DBRecordSet ($intResult = null) { - $this->SetTo($intResult); + $this->SetTo( $intResult ); } /** diff --git a/gulliver/system/class.dbsession.php b/gulliver/system/class.dbsession.php index 93e07900c..f987d45a4 100644 --- a/gulliver/system/class.dbsession.php +++ b/gulliver/system/class.dbsession.php @@ -52,12 +52,12 @@ class DBSession * @return void * */ - public function __construct($objConnection = null, $strDBName = '') + function DBSession ($objConnection = null, $strDBName = '') { if ($strDBName != '') { $strDBName = $objConnection->db->_db; } - $this->setTo($objConnection, $strDBName); + $this->setTo( $objConnection, $strDBName ); } /** diff --git a/gulliver/system/class.dbtable.php b/gulliver/system/class.dbtable.php index 64de786c9..b43929378 100644 --- a/gulliver/system/class.dbtable.php +++ b/gulliver/system/class.dbtable.php @@ -53,15 +53,12 @@ class DBTable /** * Initiate a database conecction using default values * + * @author Fernando Ontiveros Lira * @access public - * - * @param object $objConnection - * @param string $strTable - * @param array $arrKeys - * + * @param object $objConnection conecction string * @return void */ - public function __construct($objConnection = null, $strTable = "", $arrKeys = ['UID']) + public function dBTable($objConnection = null, $strTable = "", $arrKeys = array('UID')) { $this->_dbc = null; $this->_dbses = null; diff --git a/gulliver/system/class.error.php b/gulliver/system/class.error.php index fba111daf..04a454de5 100644 --- a/gulliver/system/class.error.php +++ b/gulliver/system/class.error.php @@ -77,12 +77,12 @@ class G_Error extends PEAR_Error * * @see PEAR_Error */ - public function __construct($code = G_ERROR, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null) + public function G_Error ($code = G_ERROR, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null) { - if (is_int($code)) { - $this->PEAR_Error('G Error: ' . G_Error::errorMessage($code), $code, $mode, $level, $debuginfo); + if (is_int( $code )) { + $this->PEAR_Error( 'G Error: ' . G_Error::errorMessage( $code ), $code, $mode, $level, $debuginfo ); } else { - $this->PEAR_Error("G Error: $code", DB_ERROR, $mode, $level, $debuginfo); + $this->PEAR_Error( "G Error: $code", DB_ERROR, $mode, $level, $debuginfo ); } } diff --git a/gulliver/system/class.inputfilter.php b/gulliver/system/class.inputfilter.php index c24e97ad6..ec1054abe 100644 --- a/gulliver/system/class.inputfilter.php +++ b/gulliver/system/class.inputfilter.php @@ -25,13 +25,13 @@ class InputFilter /** * Constructor for inputFilter class. Only first parameter is required. * @access constructor - * @param array $tagsArray - list of user-defined tags - * @param array $attrArray - list of user-defined attributes + * @param Array $tagsArray - list of user-defined tags + * @param Array $attrArray - list of user-defined attributes * @param int $tagsMethod - 0= allow just user-defined, 1= allow all but user-defined * @param int $attrMethod - 0= allow just user-defined, 1= allow all but user-defined * @param int $xssAuto - 0= only auto clean essentials, 1= allow clean blacklisted tags/attr */ - public function __construct($tagsArray = [], $attrArray = [], $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1) + public function inputFilter($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1) { // make sure user defined arrays are in lowercase for ($i = 0; $i < count($tagsArray); $i++) { diff --git a/gulliver/system/class.objectTemplate.php b/gulliver/system/class.objectTemplate.php index dcecb8f58..837f5afe5 100644 --- a/gulliver/system/class.objectTemplate.php +++ b/gulliver/system/class.objectTemplate.php @@ -44,7 +44,7 @@ class objectTemplate extends Smarty * @return void */ - public function __construct($templateFile) + function objectTemplate ($templateFile) { $this->template_dir = PATH_TPL; $this->compile_dir = PATH_SMARTY_C; diff --git a/gulliver/system/class.table.php b/gulliver/system/class.table.php index 2c56c3168..1ab2c2def 100644 --- a/gulliver/system/class.table.php +++ b/gulliver/system/class.table.php @@ -49,16 +49,16 @@ class Table public $_contexto = ''; /** - * Set connection using default values + * Set conecction using default values * - * @param string $objConnection connection string - * - * @return void + * @author Fernando Ontiveros Lira * @access public + * @param string $objConnection connection string + * @return void */ - public function __construct($objConnection = null) + public function Table ($objConnection = null) { - $this->SetTo($objConnection); + $this->SetTo( $objConnection ); } /** diff --git a/gulliver/system/class.tree.php b/gulliver/system/class.tree.php index ca4db501e..1dac4016c 100644 --- a/gulliver/system/class.tree.php +++ b/gulliver/system/class.tree.php @@ -25,9 +25,9 @@ class PmTree extends Xml_Node * * @param array $xmlnode default value NULL * - * @return void + * @return none */ - public function __construct($xmlnode = null) + public function PmTree($xmlnode = null) { if (!isset($xmlnode)) { return; diff --git a/gulliver/system/class.webResource.php b/gulliver/system/class.webResource.php index e7f4c6674..f8bcae563 100644 --- a/gulliver/system/class.webResource.php +++ b/gulliver/system/class.webResource.php @@ -48,34 +48,34 @@ class WebResource * @param string $uri * @param string $post * - * @return void + * @return none */ - public function __construct($uri, $post) + function WebResource ($uri, $post) { $this->_uri = $uri; - if (isset($post['function']) && $post['function'] != '') { + if (isset( $post['function'] ) && $post['function'] != '') { /*Call a function*/ - header('Content-Type: text/json'); + header( 'Content-Type: text/json' ); //$parameters=G::json_decode((urldecode($post['parameters']))); //for %AC - $parameters = G::json_decode(($post['parameters'])); - $paramsRef = array(); + $parameters = G::json_decode( ($post['parameters']) ); + $paramsRef = array (); foreach ($parameters as $key => $value) { - if (is_string($key)) { - $paramsRef[] = "\$parameters['" . addcslashes($key, '\\\'') . "']"; + if (is_string( $key )) { + $paramsRef[] = "\$parameters['" . addcslashes( $key, '\\\'' ) . "']"; } else { $paramsRef[] = '$parameters[' . $key . ']'; } } - - $paramsRef = implode(',', $paramsRef); + + $paramsRef = implode( ',', $paramsRef ); $filter = new InputFilter(); $post['function'] = $filter->validateInput($post['function']); $paramsRef = $filter->validateInput($paramsRef); - - $res = eval('return ($this->' . $post['function'] . '(' . $paramsRef . '));'); - $res = G::json_encode($res); - print ($res); + + $res = eval( 'return ($this->' . $post['function'] . '(' . $paramsRef . '));' ); + $res = G::json_encode( $res ); + print ($res) ; } else { /*Print class definition*/ $this->_encode(); diff --git a/gulliver/system/class.xmlMenu.php b/gulliver/system/class.xmlMenu.php index 6c32d3416..763ad1b3d 100644 --- a/gulliver/system/class.xmlMenu.php +++ b/gulliver/system/class.xmlMenu.php @@ -61,11 +61,11 @@ class XmlFormFieldXmlMenu extends XmlFormField * @param string $home default value '' * @param string $owner * - * @return void + * @return none */ - public function __construct($xmlNode, $lang = 'en', $home = '', $owner = null) + public function XmlFormFieldXmlMenu ($xmlNode, $lang = 'en', $home = '', $owner = null) { - parent::__construct($xmlNode, $lang, $home, $owner); + parent::__construct( $xmlNode, $lang, $home, $owner ); $this->home = $home; } diff --git a/gulliver/system/class.xmlformTemplate.php b/gulliver/system/class.xmlformTemplate.php index ac5353ff7..8b75f3af4 100644 --- a/gulliver/system/class.xmlformTemplate.php +++ b/gulliver/system/class.xmlformTemplate.php @@ -17,13 +17,13 @@ class xmlformTemplate extends Smarty /** * Function xmlformTemplate * + * @author David S. Callizaya S. + * @access public * @param string form * @param string templateFile - * * @return string - * @access public */ - public function __construct(&$form, $templateFile) + public function xmlformTemplate (&$form, $templateFile) { $this->template_dir = PATH_XMLFORM; $this->compile_dir = PATH_SMARTY_C; diff --git a/workflow/engine/classes/ReplacementLogo.php b/workflow/engine/classes/ReplacementLogo.php index a38d37e54..4a9d92d1a 100644 --- a/workflow/engine/classes/ReplacementLogo.php +++ b/workflow/engine/classes/ReplacementLogo.php @@ -6,13 +6,15 @@ */ class ReplacementLogo { + + //var $dir=''; /** * This function is the constructor of the ReplacementLogo class * param * * @return void */ - public function __construct() + public function replacementLogo () { } diff --git a/workflow/engine/classes/XMLConnection.php b/workflow/engine/classes/XMLConnection.php index 0587f6a29..ac3d937b2 100644 --- a/workflow/engine/classes/XMLConnection.php +++ b/workflow/engine/classes/XMLConnection.php @@ -13,7 +13,7 @@ class XMLConnection * @param string $file * @return void */ - public function __construct($file) + public function XMLConnection($file) { $this->xmldoc = new Xml_Document(); $this->xmldoc->parseXmlFile($file); diff --git a/workflow/engine/classes/XMLResult.php b/workflow/engine/classes/XMLResult.php index 145dd05d9..76a21904a 100644 --- a/workflow/engine/classes/XMLResult.php +++ b/workflow/engine/classes/XMLResult.php @@ -14,10 +14,9 @@ class XMLResult * XMLResult * * @param array $result - * * @return void */ - public function __construct($result = []) + public function XMLResult ($result = array()) { $this->result = $result; $this->cursor = 0; diff --git a/workflow/engine/classes/XmlFormFieldToolBar.php b/workflow/engine/classes/XmlFormFieldToolBar.php index 603ce4952..8c1e37a16 100644 --- a/workflow/engine/classes/XmlFormFieldToolBar.php +++ b/workflow/engine/classes/XmlFormFieldToolBar.php @@ -21,10 +21,9 @@ class XmlFormFieldToolBar extends XmlFormField * @param string $lang * @param string $home * @param string $owner - * * @return void */ - public function __construct($xmlNode, $lang = 'en', $home = '', $owner = ' ') + public function XmlFormFieldToolBar($xmlNode, $lang = 'en', $home = '', $owner = ' ') { parent::__construct($xmlNode, $lang, $home, $owner); $this->home = $home; diff --git a/workflow/engine/methods/services/Rest/FormatedMessage.php b/workflow/engine/methods/services/Rest/FormatedMessage.php index 4a2e35129..15661314c 100644 --- a/workflow/engine/methods/services/Rest/FormatedMessage.php +++ b/workflow/engine/methods/services/Rest/FormatedMessage.php @@ -19,7 +19,7 @@ require_once ("CURLMessage.php"); class FormatedMessage extends CURLMessage { - public function __construct() + public function FormatedMessage () { parent::__construct(); } diff --git a/workflow/engine/methods/services/Rest/JsonMessage.php b/workflow/engine/methods/services/Rest/JsonMessage.php index e89d34203..34d06135b 100644 --- a/workflow/engine/methods/services/Rest/JsonMessage.php +++ b/workflow/engine/methods/services/Rest/JsonMessage.php @@ -22,7 +22,7 @@ class JsonMessage extends FormatedMessage /** * Call the parent Curl initialization and set the type of the message */ - public function __construct() + public function JsonMessage () { parent::__construct(); $this->type = "json"; diff --git a/workflow/engine/methods/services/Rest/RestMessage.php b/workflow/engine/methods/services/Rest/RestMessage.php index 64c2c16ec..0c9e4dcee 100644 --- a/workflow/engine/methods/services/Rest/RestMessage.php +++ b/workflow/engine/methods/services/Rest/RestMessage.php @@ -22,7 +22,7 @@ class RestMessage extends SimpleMessage /** * Call the parent Curl initialization and set the type of the message */ - public function __construct() + public function RestMessage () { parent::__construct(); $this->type = "rest"; diff --git a/workflow/engine/methods/services/Rest/SimpleMessage.php b/workflow/engine/methods/services/Rest/SimpleMessage.php index 37a57d6df..5a67123ec 100644 --- a/workflow/engine/methods/services/Rest/SimpleMessage.php +++ b/workflow/engine/methods/services/Rest/SimpleMessage.php @@ -19,7 +19,7 @@ require_once ("CURLMessage.php"); class SimpleMessage extends CURLMessage { - public function __construct() + public function SimpleMessage () { parent::__construct(); } diff --git a/workflow/engine/methods/services/Rest/XmlMessage.php b/workflow/engine/methods/services/Rest/XmlMessage.php index d28b51645..f6c597100 100644 --- a/workflow/engine/methods/services/Rest/XmlMessage.php +++ b/workflow/engine/methods/services/Rest/XmlMessage.php @@ -22,7 +22,7 @@ class XmlMessage extends FormatedMessage /** * Call the parent Curl initialization and set the type of the message */ - public function __construct() + public function XmlMessage () { parent::__construct(); $this->type = "xml";