From 3b53ef4d9c02eef84cddad5c7bab45640a5f8987 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Mon, 14 Aug 2017 15:53:48 -0400 Subject: [PATCH] HOR-3670 Complete the change of name for XmlFormField classes. --- gulliver/methods/defaultAjax.php | 2 +- gulliver/system/class.filterForm.php | 2 +- gulliver/system/class.form.php | 32 +- gulliver/system/class.htmlArea.php | 68 +--- gulliver/system/class.pagedTable.php | 2 +- gulliver/system/class.publisher.php | 4 +- gulliver/system/class.wysiwygEditor.php | 4 +- gulliver/system/class.xmlMenu.php | 14 +- gulliver/system/class.xmlform.php | 367 ++++++------------ gulliver/system/class.xmlformExtension.php | 38 +- workflow/engine/PmBootstrap.php | 4 +- .../engine/classes/DynaformEditorAjax.php | 4 +- workflow/engine/classes/PopupMenu.php | 4 +- workflow/engine/classes/PropelTable.php | 2 +- workflow/engine/classes/ToolBar.php | 2 +- ..._Field_Hours.php => XmlFormFieldHours.php} | 4 +- ...Option.php => XmlFormFieldPopupOption.php} | 4 +- .../engine/classes/XmlFormFieldTextAreaPm.php | 2 +- .../engine/classes/XmlFormFieldTextPm.php | 2 +- .../engine/classes/XmlFormFieldToolBar.php | 6 +- .../engine/classes/XmlFormFieldToolButton.php | 2 +- .../classes/XmlForm_Field_CheckBoxTable.php | 4 +- .../dynaforms_checkDependentFields.php | 2 +- .../engine/methods/dynaforms/fields_Ajax.php | 2 +- workflow/engine/methods/users/myInfo_Edit.php | 2 +- 25 files changed, 195 insertions(+), 384 deletions(-) rename workflow/engine/classes/{XmlForm_Field_Hours.php => XmlFormFieldHours.php} (98%) rename workflow/engine/classes/{XmlForm_Field_PopupOption.php => XmlFormFieldPopupOption.php} (77%) diff --git a/gulliver/methods/defaultAjax.php b/gulliver/methods/defaultAjax.php index 1daa72eea..645cf34b6 100644 --- a/gulliver/methods/defaultAjax.php +++ b/gulliver/methods/defaultAjax.php @@ -54,7 +54,7 @@ if (! is_file( XMLFORM_AJAX_PATH . $xmlFile )) { } } -$G_FORM = new form( $xmlFile, $sPath ); +$G_FORM = new Form( $xmlFile, $sPath ); $G_FORM->id = urlDecode( $_POST['form'] ); $G_FORM->values = isset( $_SESSION[$G_FORM->id] ) ? $_SESSION[$G_FORM->id] : array (); diff --git a/gulliver/system/class.filterForm.php b/gulliver/system/class.filterForm.php index ef8dda3dd..8b88de924 100644 --- a/gulliver/system/class.filterForm.php +++ b/gulliver/system/class.filterForm.php @@ -32,7 +32,7 @@ * */ -class filterForm extends form +class filterForm extends Form { public $cols = 3; public $type = 'filterform'; diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index 63e3fd5bf..9814d8e5f 100644 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -1,34 +1,8 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ /** * Class Form * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ @@ -57,7 +31,6 @@ class Form extends XmlForm /** * Function setDefaultValues * - * @author David S. Callizaya S. * @access public * @return string */ @@ -109,7 +82,6 @@ class Form extends XmlForm /** * Function Form * - * @author David S. Callizaya S. * @access public * @param string filename * @param string home @@ -118,7 +90,7 @@ class Form extends XmlForm * @param string $visual_frontend * @return string */ - public function Form ($filename, $home = '', $language = '', $forceParse = false, $visual_frontend = null) + public function __construct ($filename, $home = '', $language = '', $forceParse = false, $visual_frontend = null) { $this->visual_frontend = $visual_frontend; if ($language === '') { @@ -218,7 +190,7 @@ class Form extends XmlForm $values = $this->values; $aValuekeys = array_keys( $values ); if (isset( $aValuekeys[0] ) && ((int) $aValuekeys[0] == 1)) { - $values = XmlForm_Field_Grid::flipValues( $values ); + $values = XmlFormFieldGrid::flipValues( $values ); } //TODO: Review when $values of a grid has only one row it is converted as a $values for a list (when template="grid" at addContent()) if (is_array( reset( $values ) )) { diff --git a/gulliver/system/class.htmlArea.php b/gulliver/system/class.htmlArea.php index e9a4bace8..b5e5e32ed 100644 --- a/gulliver/system/class.htmlArea.php +++ b/gulliver/system/class.htmlArea.php @@ -1,59 +1,33 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - /** * * @package gulliver.system * */ -class XmlForm_Field_HTML extends XmlForm_Field_Textarea +class XmlFormFieldHTML extends XmlFormFieldTextarea { - /* //'default','office2003','silver' - var $skin = 'default'; - //'Default','Basic' - var $toolbarSet = 'Default'; - var $width = '90%'; - var $height = '200' ; - var $cols = 40; - var $rows = 6; - function render( $value , $owner=NULL ) { - if ($this->mode==='edit') { - if ($this->readOnly) - $html=''; - else - $html=''; - } elseif ($this->mode==='view') { - $html=''; - } else { - $html=''; - } - return $html; + /* //'default','office2003','silver' + var $skin = 'default'; + //'Default','Basic' + var $toolbarSet = 'Default'; + var $width = '90%'; + var $height = '200' ; + var $cols = 40; + var $rows = 6; + function render( $value , $owner=NULL ) { + if ($this->mode==='edit') { + if ($this->readOnly) + $html=''; + else + $html=''; + } elseif ($this->mode==='view') { + $html=''; + } else { + $html=''; + } + return $html; }*/ /** * attachEvents function is putting its events diff --git a/gulliver/system/class.pagedTable.php b/gulliver/system/class.pagedTable.php index 670659643..ce030655d 100644 --- a/gulliver/system/class.pagedTable.php +++ b/gulliver/system/class.pagedTable.php @@ -90,7 +90,7 @@ class pagedTable public $name = 'pagedTable'; public $id = 'A1'; public $disableFooter = false; - //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlForm_Field_cellMark) + //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlFormFieldCellMark) public $tdStyle = ''; public $tdClass = ''; //Config Save definition diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php index 31359711c..0d0904c98 100644 --- a/gulliver/system/class.publisher.php +++ b/gulliver/system/class.publisher.php @@ -192,7 +192,7 @@ class Publisher if (($this->publishType == 'dynaform') && (($Part['Template'] == 'xmlform') || ($Part['Template'] == 'xmlform_preview'))) { $dynaformShow = (isset( $G_FORM->printdynaform ) && ($G_FORM->printdynaform)) ? 'gulliver/dynaforms_OptionsPrint' : 'gulliver/dynaforms_Options'; - $G_FORM->fields = G::array_merges( array ('__DYNAFORM_OPTIONS' => new XmlForm_Field_XmlMenu( new Xml_Node( '__DYNAFORM_OPTIONS', 'complete', '', array ('type' => 'xmlmenu','xmlfile' => $dynaformShow, 'parentFormId' => $G_FORM->id + $G_FORM->fields = G::array_merges( array ('__DYNAFORM_OPTIONS' => new XmlFormFieldXmlMenu( new Xml_Node( '__DYNAFORM_OPTIONS', 'complete', '', array ('type' => 'xmlmenu','xmlfile' => $dynaformShow, 'parentFormId' => $G_FORM->id ) ), SYS_LANG, PATH_XMLFORM, $G_FORM ) ), $G_FORM->fields ); } @@ -369,7 +369,7 @@ class Publisher default: $label = ($oTable->fields[$f]['Label'] != '') ? $oTable->fields[$f]['Label'] : $f; $label = str_replace( "\n", ' ', $label ); - $pm->fields[$f] = new XmlForm_Field_PopupOption( new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $oTable->id . '.showHideField("' . $f . '")' ) ) ); + $pm->fields[$f] = new XmlFormFieldPopupOption( new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $oTable->id . '.showHideField("' . $f . '")' ) ) ); $pm->values[$f] = ''; } } diff --git a/gulliver/system/class.wysiwygEditor.php b/gulliver/system/class.wysiwygEditor.php index 7f18c9bbb..15e6a6782 100644 --- a/gulliver/system/class.wysiwygEditor.php +++ b/gulliver/system/class.wysiwygEditor.php @@ -26,7 +26,7 @@ */ /** - * XmlForm_Field_HTML class definition + * XmlFormFieldWYSIWYGEditor class definition * It is useful to see dynaforms how are built * * @package gulliver.system @@ -36,7 +36,7 @@ * */ -class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field +class XmlFormFieldWYSIWYGEditor extends XmlFormField { public $width = '100%'; public $height = '300'; diff --git a/gulliver/system/class.xmlMenu.php b/gulliver/system/class.xmlMenu.php index c6745e98a..2bba1b6e7 100644 --- a/gulliver/system/class.xmlMenu.php +++ b/gulliver/system/class.xmlMenu.php @@ -30,21 +30,21 @@ * * @package gulliver.system */ -class xmlMenu extends form +class xmlMenu extends Form { public $type = 'xmlmenu'; public $parentFormId; } /** - * XmlForm_Field_XmlMenu + * XmlFormFieldXmlMenu * - * extends XmlForm_Field + * extends XmlFormField * * @package gulliver.system * */ -class XmlForm_Field_XmlMenu extends XmlForm_Field +class XmlFormFieldXmlMenu extends XmlFormField { public $xmlfile = ''; public $type = 'xmlmenuDyn'; @@ -54,7 +54,7 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field public $parentFormId; /** - * XmlForm_Field_XmlMenu + * XmlFormFieldXmlMenu * * @param string $xmlNode * @param string $lang default value 'en' @@ -63,9 +63,9 @@ class XmlForm_Field_XmlMenu extends XmlForm_Field * * @return none */ - public function XmlForm_Field_XmlMenu ($xmlNode, $lang = 'en', $home = '', $owner = null) + public function XmlFormFieldXmlMenu ($xmlNode, $lang = 'en', $home = '', $owner = null) { - parent::XmlForm_Field( $xmlNode, $lang, $home, $owner ); + parent::__construct( $xmlNode, $lang, $home, $owner ); $this->home = $home; } diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 29216a0a1..1418fbc38 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -1,40 +1,14 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ use ProcessMaker\Plugins\PluginRegistry; /** - * Class XmlForm_Field + * Class XmlFormField * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field +class XmlFormField { public $name = ''; public $type = 'field'; @@ -82,16 +56,15 @@ class XmlForm_Field public $modeForGrid = ''; /** - * Function XmlForm_Field + * Function XmlFormField * - * @author David S. Callizaya S. * @access public * @param string xmlNode * @param string lang * @param string home * @return string */ - public function XmlForm_Field ($xmlNode, $lang = 'en', $home = '', $owner = null) + public function __construct ($xmlNode, $lang = 'en', $home = '', $owner = null) { //Loads any attribute that were defined in the xmlNode //except name and label. @@ -141,7 +114,6 @@ class XmlForm_Field } $this->options = (isset( $this->option )) ? $this->option : array (); //Sql Options : cause warning because values are not setted yet. - //if ($this->sql!=='') $this->executeSQL(); if (isset( $owner )) { if (isset( $owner->mode )) { $ownerMode = $owner->mode; @@ -315,7 +287,6 @@ class XmlForm_Field /** * Function executeSQL * - * @author David S. Callizaya S. * @access public * @param string owner * @return string @@ -398,7 +369,6 @@ class XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -412,7 +382,6 @@ class XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @return string @@ -446,7 +415,6 @@ class XmlForm_Field /** * Function dependentOf * - * @author David S. Callizaya S. * @access public * @return array */ @@ -472,7 +440,6 @@ class XmlForm_Field /** * Function mask * - * @author David S. Callizaya S. * @access public * @param string format * @param string value @@ -534,7 +501,6 @@ class XmlForm_Field /** * Function getAttributes * - * @author David S. Callizaya S. * @access public * @return string */ @@ -566,7 +532,6 @@ class XmlForm_Field /** * Function getEvents * - * @author David S. Callizaya S. * @access public * @return string */ @@ -590,7 +555,6 @@ class XmlForm_Field * Function attachEvents: Attaches events to a control using * leimnud.event.add * - * @author David S. Callizaya S. * @param $elementRef * @access public */ @@ -608,7 +572,6 @@ class XmlForm_Field * Function createXmlNode: Creates an Xml_Node object storing * the data of $this Xml_Field. * - * @author David S. Callizaya S. * @access public * @return Xml_Node */ @@ -639,7 +602,6 @@ class XmlForm_Field * Function updateXmlNode: Updates and existing Xml_Node * with the data of $this Xml_Field. * - * @author David S. Callizaya S. * @access public * @param string value * @return Xml_Node @@ -672,7 +634,6 @@ class XmlForm_Field * Function getXmlAttributes: Returns an associative array * with the attributes of $this Xml_field (only the modified ones). * - * @author David S. Callizaya S. * @access public * @param boolean includeDefaultValues Includes attributes * with default values. @@ -925,19 +886,17 @@ class XmlForm_Field } /** - * Class XmlForm_Field_Title + * Class XmlFormFieldTitle * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Title extends XmlForm_Field +class XmlFormFieldTitle extends XmlFormField { /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -961,19 +920,17 @@ class XmlForm_Field_Title extends XmlForm_Field } /** - * Class XmlForm_Field_Subtitle + * Class XmlFormFieldSubtitle * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Subtitle extends XmlForm_Field +class XmlFormFieldSubtitle extends XmlFormField { /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -996,13 +953,12 @@ class XmlForm_Field_Subtitle extends XmlForm_Field } /** - * Class XmlForm_Field_SimpleText + * Class XmlFormFieldSimpleText * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_SimpleText extends XmlForm_Field +class XmlFormFieldSimpleText extends XmlFormField { public $size = 15; public $maxLength = ''; @@ -1015,7 +971,6 @@ class XmlForm_Field_SimpleText extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -1042,7 +997,6 @@ class XmlForm_Field_SimpleText extends XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @param string owner @@ -1088,13 +1042,12 @@ class XmlForm_Field_SimpleText extends XmlForm_Field } /** - * Class XmlForm_Field_Text + * Class XmlFormFieldText * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Text extends XmlForm_Field_SimpleText +class XmlFormFieldText extends XmlFormFieldSimpleText { public $size = 15; public $maxLength = 64; @@ -1122,7 +1075,6 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -1215,7 +1167,6 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @param string owner @@ -1282,13 +1233,12 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText } /** - * Class XmlForm_Field_Suggest + * Class XmlFormFieldSuggest * - * @author Erik Amaru Ortiz * @package gulliver.system * @access public */ -class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek +class XmlFormFieldSuggest extends XmlFormFieldSimpleText { public $size = 15; public $maxLength = 64; @@ -1734,7 +1684,6 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @param string owner @@ -1771,7 +1720,7 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek * * @package gulliver.system */ -class XmlForm_Field_Print extends XmlForm_Field_SimpleText //by neyek +class XmlFormFieldPrint extends XmlFormFieldSimpleText //by neyek { //Instead of public --> link public $link = ''; @@ -1815,7 +1764,7 @@ class XmlForm_Field_Print extends XmlForm_Field_SimpleText //by neyek * * @package gulliver.system */ -class XmlForm_Field_Caption extends XmlForm_Field +class XmlFormFieldCaption extends XmlFormField { public $defaultValue = ''; @@ -1844,7 +1793,6 @@ class XmlForm_Field_Caption extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string modified @@ -1897,13 +1845,12 @@ class XmlForm_Field_Caption extends XmlForm_Field } /** - * Class XmlForm_Field_Password + * Class XmlFormFieldPassword * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Password extends XmlForm_Field +class XmlFormFieldPassword extends XmlFormField { public $size = 15; public $maxLength = 15; @@ -1914,7 +1861,6 @@ class XmlForm_Field_Password extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -1948,13 +1894,12 @@ class XmlForm_Field_Password extends XmlForm_Field } /** - * Class XmlForm_Field_Textarea + * Class XmlFormFieldTextarea * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Textarea extends XmlForm_Field +class XmlFormFieldTextarea extends XmlFormField { public $rows = 12; public $cols = 40; @@ -1968,7 +1913,6 @@ class XmlForm_Field_Textarea extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -2029,7 +1973,6 @@ class XmlForm_Field_Textarea extends XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -2100,13 +2043,12 @@ class XmlForm_Field_Textarea extends XmlForm_Field } /** - * Class XmlForm_Field_Currency + * Class XmlFormFieldCurrency * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Currency extends XmlForm_Field_SimpleText +class XmlFormFieldCurrency extends XmlFormFieldSimpleText { public $group = 0; public $size = 15; @@ -2253,13 +2195,12 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText * * @package gulliver.system */ -class XmlForm_Field_CaptionCurrency extends XmlForm_Field +class XmlFormFieldCaptionCurrency extends XmlFormField { /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -2271,13 +2212,12 @@ class XmlForm_Field_CaptionCurrency extends XmlForm_Field } /** - * Class XmlForm_Field_Percentage + * Class XmlFormFieldPercentage * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText +class XmlFormFieldPercentage extends XmlFormFieldSimpleText { public $size = 15; public $required = false; @@ -2400,7 +2340,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText * * @package gulliver.system */ -class XmlForm_Field_CaptionPercentage extends XmlForm_Field +class XmlFormFieldCaptionPercentage extends XmlFormField { public function render($value = null, $paramDummy2 = null) @@ -2410,13 +2350,12 @@ class XmlForm_Field_CaptionPercentage extends XmlForm_Field } /** - * Class XmlForm_Field_Date + * Class XmlFormFieldDate * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Date2 extends XmlForm_Field_SimpleText +class XmlFormFieldDate2 extends XmlFormFieldSimpleText { //Instead of size --> startDate public $startDate = ''; @@ -2677,7 +2616,7 @@ class XmlForm_Field_Date2 extends XmlForm_Field_SimpleText * * @package gulliver.system */ -class XmlForm_Field_DateView extends XmlForm_Field +class XmlFormFieldDateView extends XmlFormField { public function render($value = null, $paramDummy2 = null) @@ -2687,13 +2626,12 @@ class XmlForm_Field_DateView extends XmlForm_Field } /** - * Class XmlForm_Field_YesNo + * Class XmlFormFieldYesNo * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_YesNo extends XmlForm_Field +class XmlFormFieldYesNo extends XmlFormField { public $required = false; public $readonly = false; @@ -2702,7 +2640,6 @@ class XmlForm_Field_YesNo extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -2816,13 +2753,12 @@ class XmlForm_Field_YesNo extends XmlForm_Field } /** - * Class XmlForm_Field_Link + * Class XmlFormFieldLink * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Link extends XmlForm_Field +class XmlFormFieldLink extends XmlFormField { //Instead of var --> link public $link = ''; @@ -2835,7 +2771,6 @@ class XmlForm_Field_Link extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -2953,13 +2888,12 @@ class XmlForm_Field_Link extends XmlForm_Field } /** - * Class XmlForm_Field_File + * Class XmlFormFieldFile * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_File extends XmlForm_Field +class XmlFormFieldFile extends XmlFormField { public $required = false; public $input = null; @@ -2968,7 +2902,6 @@ class XmlForm_Field_File extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -3090,14 +3023,13 @@ class XmlForm_Field_File extends XmlForm_Field } /** - * Class XmlForm_Field_Dropdownpt + * Class XmlFormFieldDropdownpt * hook, dropdown field for Propel table * - * @author Erik Amaru * @package gulliver.system * @access public */ -class XmlForm_Field_Dropdownpt extends XmlForm_Field +class XmlFormFieldDropdownpt extends XmlFormField { public $value; @@ -3126,14 +3058,13 @@ class XmlForm_Field_Dropdownpt extends XmlForm_Field } /** - * Class XmlForm_Field_Checkboxpt + * Class XmlFormFieldCheckboxpt * checkbox field for Propel table * - * @author Erik Amaru * @package gulliver.system * @access public */ -class XmlForm_Field_Checkboxpt extends XmlForm_Field +class XmlFormFieldCheckboxpt extends XmlFormField { public $required = false; public $value = 'on'; @@ -3192,13 +3123,12 @@ class XmlForm_Field_Checkboxpt extends XmlForm_Field } /** - * Class XmlForm_Field_Checkbox + * Class XmlFormFieldCheckbox * - * @author Erik Amaru * @package gulliver.system * @access public */ -class XmlForm_Field_Checkbox extends XmlForm_Field +class XmlFormFieldCheckbox extends XmlFormField { public $required = false; public $value = 'on'; @@ -3209,7 +3139,6 @@ class XmlForm_Field_Checkbox extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -3304,7 +3233,7 @@ class XmlForm_Field_Checkbox extends XmlForm_Field * * @package gulliver.system */ -class XmlForm_Field_Checkbox2 extends XmlForm_Field +class XmlFormFieldCheckbox2 extends XmlFormField { public $required = false; @@ -3315,13 +3244,12 @@ class XmlForm_Field_Checkbox2 extends XmlForm_Field } /** - * Class XmlForm_Field_Button + * Class XmlFormFieldButton * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Button extends XmlForm_Field +class XmlFormFieldButton extends XmlFormField { public $onclick = ''; public $align = 'center'; @@ -3330,7 +3258,6 @@ class XmlForm_Field_Button extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -3351,19 +3278,17 @@ class XmlForm_Field_Button extends XmlForm_Field } /** - * Class XmlForm_Field_Reset + * Class XmlFormFieldReset * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Reset extends XmlForm_Field +class XmlFormFieldReset extends XmlFormField { /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -3386,20 +3311,18 @@ class XmlForm_Field_Reset extends XmlForm_Field } /** - * Class XmlForm_Field_Submit + * Class XmlFormFieldSubmit * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Submit extends XmlForm_Field +class XmlFormFieldSubmit extends XmlFormField { public $onclick = ''; /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -3428,13 +3351,12 @@ class XmlForm_Field_Submit extends XmlForm_Field } /** - * Class XmlForm_Field_Hidden + * Class XmlFormFieldHidden * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Hidden extends XmlForm_Field +class XmlFormFieldHidden extends XmlFormField { public $sqlConnection = 0; public $sql = ''; @@ -3444,7 +3366,6 @@ class XmlForm_Field_Hidden extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -3509,13 +3430,12 @@ class XmlForm_Field_Hidden extends XmlForm_Field } /** - * Class XmlForm_Field_Dropdown + * Class XmlFormFieldDropdown * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Dropdown extends XmlForm_Field +class XmlFormFieldDropdown extends XmlFormField { public $defaultValue = ''; public $required = false; @@ -3539,7 +3459,6 @@ class XmlForm_Field_Dropdown extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -3713,7 +3632,6 @@ class XmlForm_Field_Dropdown extends XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @return string @@ -3736,13 +3654,12 @@ class XmlForm_Field_Dropdown extends XmlForm_Field } /** - * Class XmlForm_Field_Listbox + * Class XmlFormFieldListbox * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Listbox extends XmlForm_Field +class XmlFormFieldListbox extends XmlFormField { public $defaultValue = ''; public $required = false; @@ -3756,7 +3673,6 @@ class XmlForm_Field_Listbox extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -3854,13 +3770,12 @@ class XmlForm_Field_Listbox extends XmlForm_Field } /** - * Class XmlForm_Field_RadioGroup + * Class XmlFormFieldRadioGroup * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_RadioGroup extends XmlForm_Field +class XmlFormFieldRadioGroup extends XmlFormField { public $defaultValue = ''; public $required = false; @@ -3874,7 +3789,6 @@ class XmlForm_Field_RadioGroup extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -3933,7 +3847,7 @@ class XmlForm_Field_RadioGroup extends XmlForm_Field * @package gulliver.system * */ -class XmlForm_Field_RadioGroupView extends XmlForm_Field +class XmlFormFieldRadioGroupView extends XmlFormField { public $defaultValue = ''; public $required = false; @@ -3945,7 +3859,6 @@ class XmlForm_Field_RadioGroupView extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -3963,13 +3876,12 @@ class XmlForm_Field_RadioGroupView extends XmlForm_Field } /** - * Class XmlForm_Field_CheckGroup + * Class XmlFormFieldCheckGroup * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_CheckGroup extends XmlForm_Field +class XmlFormFieldCheckGroup extends XmlFormField { public $required = false; public $option = array (); @@ -3984,7 +3896,6 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -4087,7 +3998,7 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field * @package gulliver.system * */ -class XmlForm_Field_CheckGroupView extends XmlForm_Field +class XmlFormFieldCheckGroupView extends XmlFormField { public $option = array (); public $sqlConnection = 0; @@ -4097,7 +4008,6 @@ class XmlForm_Field_CheckGroupView extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -4113,13 +4023,12 @@ class XmlForm_Field_CheckGroupView extends XmlForm_Field } /** - * Class XmlForm_Field_Grid + * Class XmlFormFieldGrid * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_Grid extends XmlForm_Field +class XmlFormFieldGrid extends XmlFormField { public $xmlGrid = ''; public $initRows = 1; @@ -4135,25 +4044,23 @@ class XmlForm_Field_Grid extends XmlForm_Field public $id = ''; /** - * Function XmlForm_Field_Grid + * Function XmlFormFieldGrid * - * @author David S. Callizaya S. * @access public * @param string xmlnode * @param string language * @param string home * @return string */ - public function XmlForm_Field_Grid ($xmlnode, $language, $home) + public function __construct ($xmlnode, $language, $home) { - parent::XmlForm_Field( $xmlnode, $language ); + parent::__construct( $xmlnode, $language ); $this->parseFile( $home, $language ); } /** * Function parseFile * - * @author David S. Callizaya S. * @access public * @param string home * @param string language @@ -4191,7 +4098,6 @@ class XmlForm_Field_Grid extends XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string values * @return string @@ -4387,28 +4293,26 @@ class XmlForm_Field_Grid extends XmlForm_Field } /** - * Class XmlForm_Field_JavaScript + * Class XmlFormFieldJavaScript * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ -class XmlForm_Field_JavaScript extends XmlForm_Field +class XmlFormFieldJavaScript extends XmlFormField { public $code = ''; public $replaceTags = true; /** - * Function XmlForm_Field_JavaScript + * Function XmlFormFieldJavaScript * - * @author David S. Callizaya S. * @access public * @param string xmlNode * @param string lang * @param string home * @return string */ - public function XmlForm_Field_JavaScript ($xmlNode, $lang = 'en', $home = '') + public function __construct ($xmlNode, $lang = 'en', $home = '') { //Loads any attribute that were defined in the xmlNode //except name and label. @@ -4432,7 +4336,6 @@ class XmlForm_Field_JavaScript extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string value * @return string @@ -4446,7 +4349,6 @@ class XmlForm_Field_JavaScript extends XmlForm_Field /** * Function renderGrid * - * @author David S. Callizaya S. * @access public * @param string value * @param string owner @@ -4470,12 +4372,11 @@ class XmlForm_Field_JavaScript extends XmlForm_Field } /** - * - * @author Erik amaru Ortiz * Comment Working for after and before date attributes + * * @package gulliver.system */ -class XmlForm_Field_Date extends XmlForm_Field_SimpleText +class XmlFormFieldDate extends XmlFormFieldSimpleText { public $required = false; public $readOnly = false; @@ -4932,10 +4833,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText /** * Calendar Widget with Javascript Routines * - * @author Erik amaru Ortiz * @package gulliver.system */ -class XmlForm_Field_Date5 extends XmlForm_Field_SimpleText +class XmlFormFieldDate5 extends XmlFormFieldSimpleText { public $required = false; public $readOnly = false; @@ -5345,11 +5245,8 @@ class XmlForm_Field_Date5 extends XmlForm_Field_SimpleText /** * * @package gulliver.system - * AVOID TO ENTER HERE : EXPERIMENTAL !!! - * by Caleeli. - * */ -class XmlForm_Field_Xmlform extends XmlForm_Field +class XmlFormFieldXmlform extends XmlFormField { public $xmlfile = ''; public $initRows = 1; @@ -5365,25 +5262,23 @@ class XmlForm_Field_Xmlform extends XmlForm_Field public $id = ''; /** - * Function XmlForm_Field_Xmlform + * Function XmlFormFieldXmlform * - * @author David S. Callizaya S. * @access public * @param string xmlnode * @param string language * @param string home * @return string */ - public function XmlForm_Field_Xmlform ($xmlnode, $language, $home) + public function __construct ($xmlnode, $language, $home) { - parent::XmlForm_Field( $xmlnode, $language ); + parent::__construct( $xmlnode, $language ); $this->parseFile( $home, $language ); } /** * Function parseFile * - * @author David S. Callizaya S. * @access public * @param string home * @param string language @@ -5403,7 +5298,6 @@ class XmlForm_Field_Xmlform extends XmlForm_Field /** * Function render * - * @author David S. Callizaya S. * @access public * @param string values * @return string @@ -5431,7 +5325,6 @@ class XmlForm_Field_Xmlform extends XmlForm_Field * Class XmlForm * Main Class * - * @author David S. Callizaya S. * @package gulliver.system * @access public */ @@ -5473,58 +5366,58 @@ class XmlForm * @var string[] */ private static $controls = [ - 'button' => XmlForm_Field_Button::class, - 'caption' => XmlForm_Field_Caption::class, - 'captioncurrency' => XmlForm_Field_CaptionCurrency::class, - 'captionpercentage' => XmlForm_Field_CaptionPercentage::class, - 'cellmark' => XmlForm_Field_cellMark::class, - 'checkbox2' => XmlForm_Field_Checkbox2::class, - 'checkbox' => XmlForm_Field_Checkbox::class, - 'checkboxpt' => XmlForm_Field_Checkboxpt::class, - 'checkboxtable' => XmlForm_Field_CheckBoxTable::class, - 'checkgroup' => XmlForm_Field_CheckGroup::class, - 'checkgroupview' => XmlForm_Field_CheckGroupView::class, - 'currency' => XmlForm_Field_Currency::class, - 'date2' => XmlForm_Field_Date2::class, - 'date5' => XmlForm_Field_Date5::class, - 'date' => XmlForm_Field_Date::class, - 'dateview' => XmlForm_Field_DateView::class, - 'dropdown' => XmlForm_Field_Dropdown::class, - 'dropdownpt' => XmlForm_Field_Dropdownpt::class, - 'dveditor' => XmlForm_Field_DVEditor::class, - 'fastsearch' => XmlForm_Field_FastSearch::class, - 'file' => XmlForm_Field_File::class, - 'grid' => XmlForm_Field_Grid::class, - 'hidden' => XmlForm_Field_Hidden::class, - 'hours' => XmlForm_Field_Hours::class, - 'html' => XmlForm_Field_HTML::class, - 'image' => XmlForm_Field_Image::class, - 'javascript' => XmlForm_Field_JavaScript::class, - 'label' => XmlForm_Field_Label::class, - 'link' => XmlForm_Field_Link::class, - 'listbox' => XmlForm_Field_Listbox::class, - 'password' => XmlForm_Field_Password::class, - 'percentage' => XmlForm_Field_Percentage::class, - 'popupoption' => XmlForm_Field_PopupOption::class, - 'print' => XmlForm_Field_Print::class, - 'radiogroup' => XmlForm_Field_RadioGroup::class, - 'radiogroupview' => XmlForm_Field_RadioGroupView::class, - 'reset' => XmlForm_Field_Reset::class, - 'simpletext' => XmlForm_Field_SimpleText::class, - 'submit' => XmlForm_Field_Submit::class, - 'subtitle' => XmlForm_Field_Subtitle::class, - 'suggest' => XmlForm_Field_Suggest::class, - 'text' => XmlForm_Field_Text::class, - 'textarea' => XmlForm_Field_Textarea::class, + 'button' => XmlFormFieldButton::class, + 'caption' => XmlFormFieldCaption::class, + 'captioncurrency' => XmlFormFieldCaptionCurrency::class, + 'captionpercentage' => XmlFormFieldCaptionPercentage::class, + 'cellmark' => XmlFormFieldCellMark::class, + 'checkbox2' => XmlFormFieldCheckbox2::class, + 'checkbox' => XmlFormFieldCheckbox::class, + 'checkboxpt' => XmlFormFieldCheckboxpt::class, + 'checkboxtable' => XmlFormFieldCheckBoxTable::class, + 'checkgroup' => XmlFormFieldCheckGroup::class, + 'checkgroupview' => XmlFormFieldCheckGroupView::class, + 'currency' => XmlFormFieldCurrency::class, + 'date2' => XmlFormFieldDate2::class, + 'date5' => XmlFormFieldDate5::class, + 'date' => XmlFormFieldDate::class, + 'dateview' => XmlFormFieldDateView::class, + 'dropdown' => XmlFormFieldDropdown::class, + 'dropdownpt' => XmlFormFieldDropdownpt::class, + 'dveditor' => XmlFormFieldDVEditor::class, + 'fastsearch' => XmlFormFieldFastSearch::class, + 'file' => XmlFormFieldFile::class, + 'grid' => XmlFormFieldGrid::class, + 'hidden' => XmlFormFieldHidden::class, + 'hours' => XmlFormFieldHours::class, + 'html' => XmlFormFieldHTML::class, + 'image' => XmlFormFieldImage::class, + 'javascript' => XmlFormFieldJavaScript::class, + 'label' => XmlFormFieldLabel::class, + 'link' => XmlFormFieldLink::class, + 'listbox' => XmlFormFieldListbox::class, + 'password' => XmlFormFieldPassword::class, + 'percentage' => XmlFormFieldPercentage::class, + 'popupoption' => XmlFormFieldPopupOption::class, + 'print' => XmlFormFieldPrint::class, + 'radiogroup' => XmlFormFieldRadioGroup::class, + 'radiogroupview' => XmlFormFieldRadioGroupView::class, + 'reset' => XmlFormFieldReset::class, + 'simpletext' => XmlFormFieldSimpleText::class, + 'submit' => XmlFormFieldSubmit::class, + 'subtitle' => XmlFormFieldSubtitle::class, + 'suggest' => XmlFormFieldSuggest::class, + 'text' => XmlFormFieldText::class, + 'textarea' => XmlFormFieldTextarea::class, 'textareapm' => XmlFormFieldTextareaPM::class, 'textpm' => XmlFormFieldTextPM::class, - 'title' => XmlForm_Field_Title::class, + 'title' => XmlFormFieldTitle::class, 'toolbar' => XmlFormFieldToolBar::class, - 'toolbutton' => XmlFormFieldtoolButton::class, - 'wysiwyg_editor' => XmlForm_Field_WYSIWYG_EDITOR::class, - 'xmlform' => XmlForm_Field_Xmlform::class, - 'xmlmenu' => XmlForm_Field_XmlMenu::class, - 'yesno' => XmlForm_Field_YesNo::class, + 'toolbutton' => XmlFormFieldToolButton::class, + 'wysiwyg_editor' => XmlFormFieldWYSIWYGEditor::class, + 'xmlform' => XmlFormFieldXmlform::class, + 'xmlmenu' => XmlFormFieldXmlMenu::class, + 'yesno' => XmlFormFieldYesNo::class, ]; /** @@ -5543,14 +5436,13 @@ class XmlForm } elseif (class_exists('XmlForm_Field_' . $key)) { return 'XmlForm_Field_' . $key; } else { - return 'XmlForm_Field'; + return XmlFormField::class; } } /** * Function xmlformTemplate * - * @author David S. Callizaya S. * @access public * @param string form * @param string templateFile @@ -5804,9 +5696,9 @@ class XmlForm } /** -* @package gulliver.system -*/ -class XmlForm_Field_Image extends XmlForm_Field + * @package gulliver.system + */ +class XmlFormFieldImage extends XmlFormField { public $file = ''; public $home = 'public_html'; @@ -5814,7 +5706,6 @@ class XmlForm_Field_Image extends XmlForm_Field /** * Function render - * @author David S. Callizaya S. * @access public * @param string values * @return string diff --git a/gulliver/system/class.xmlformExtension.php b/gulliver/system/class.xmlformExtension.php index f369f65a4..b990e9752 100644 --- a/gulliver/system/class.xmlformExtension.php +++ b/gulliver/system/class.xmlformExtension.php @@ -1,36 +1,10 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - /** * * @package gulliver.system */ -class XmlForm_Field_Label extends XmlForm_Field +class XmlFormFieldLabel extends XmlFormField { public $withoutValue = true; public $align = 'left'; @@ -43,7 +17,7 @@ class XmlForm_Field_Label extends XmlForm_Field * * @package gulliver.system */ -class XmlForm_Field_cellMark extends XmlForm_Field +class XmlFormFieldCellMark extends XmlFormField { /* Defines the style of the next tds of the pagedTable. @@ -91,14 +65,14 @@ class XmlForm_Field_cellMark extends XmlForm_Field } /** - * XmlForm_Field_DVEditor + * XmlFormFieldDVEditor * - * extends XmlForm_Field + * extends XmlFormField * * @package gulliver.system * */ -class XmlForm_Field_DVEditor extends XmlForm_Field +class XmlFormFieldDVEditor extends XmlFormField { public $toolbarSet = 'toolbar2lines.html'; public $width = '90%'; @@ -150,7 +124,7 @@ class XmlForm_Field_DVEditor extends XmlForm_Field * * @package gulliver.system */ -class XmlForm_Field_FastSearch extends XmlForm_Field_Text +class XmlFormFieldFastSearch extends XmlFormFieldText { public $onkeypress = "if (event.keyCode===13)@#PAGED_TABLE_ID.doFastSearch(this.value);if (event.keyCode===13)return false;"; public $colAlign = "right"; diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php index 9b55c5b43..d20698611 100644 --- a/workflow/engine/PmBootstrap.php +++ b/workflow/engine/PmBootstrap.php @@ -82,7 +82,7 @@ class PmBootstrap extends Bootstrap $this->autoloader->registerClass('publisher', PATH_GULLIVER . 'class.publisher'); $this->autoloader->registerClass('templatePower', PATH_GULLIVER . 'class.templatePower'); $this->autoloader->registerClass('xmlDocument', PATH_GULLIVER . 'class.xmlDocument'); - $this->autoloader->registerClass('XmlForm_Field_XmlMenu', PATH_GULLIVER . 'class.xmlMenu'); + $this->autoloader->registerClass('XmlFormFieldXmlMenu', PATH_GULLIVER . 'class.xmlMenu'); $this->autoloader->registerClass('xmlform', PATH_GULLIVER . 'class.xmlform'); $this->autoloader->registerClass('xmlformExtension', PATH_GULLIVER . 'class.xmlformExtension'); @@ -96,7 +96,7 @@ class PmBootstrap extends Bootstrap $this->autoloader->registerClass('headPublisher', PATH_GULLIVER . 'class.headPublisher'); $this->autoloader->registerClass('Xml_Node', PATH_GULLIVER . 'class.xmlDocument'); $this->autoloader->registerClass('Xml_document', PATH_GULLIVER . 'class.xmlDocument'); - $this->autoloader->registerClass('XmlForm_Field_*', PATH_GULLIVER . 'class.xmlform'); + $this->autoloader->registerClass('XmlFormField*', PATH_GULLIVER . 'class.xmlform'); $this->autoloader->registerClass('ServerConf', PATH_CORE . 'classes/class.serverConfiguration'); } diff --git a/workflow/engine/classes/DynaformEditorAjax.php b/workflow/engine/classes/DynaformEditorAjax.php index 7e58676e9..a27f73dbb 100644 --- a/workflow/engine/classes/DynaformEditorAjax.php +++ b/workflow/engine/classes/DynaformEditorAjax.php @@ -117,7 +117,7 @@ $form = new Form($fileTmp, PATH_DYNAFORM, SYS_LANG, true); //Navigation Bar - $form->fields = G::array_merges(array("__DYNAFORM_OPTIONS" => new XmlForm_Field_XmlMenu(new Xml_Node("__DYNAFORM_OPTIONS", "complete", "", array("type" => "xmlmenu", "xmlfile" => "gulliver/dynaforms_Options" + $form->fields = G::array_merges(array("__DYNAFORM_OPTIONS" => new XmlFormFieldXmlMenu(new Xml_Node("__DYNAFORM_OPTIONS", "complete", "", array("type" => "xmlmenu", "xmlfile" => "gulliver/dynaforms_Options" )), SYS_LANG, PATH_XMLFORM, $form) ), $form->fields); @@ -187,7 +187,7 @@ $form = new Form($fileTmp, PATH_DYNAFORM, SYS_LANG, true); //Navigation Bar - $form->fields = G::array_merges(array("__DYNAFORM_OPTIONS" => new XmlForm_Field_XmlMenu(new Xml_Node("__DYNAFORM_OPTIONS", "complete", "", array("type" => "xmlmenu", "xmlfile" => "gulliver/dynaforms_Options" + $form->fields = G::array_merges(array("__DYNAFORM_OPTIONS" => new XmlFormFieldXmlMenu(new Xml_Node("__DYNAFORM_OPTIONS", "complete", "", array("type" => "xmlmenu", "xmlfile" => "gulliver/dynaforms_Options" )), SYS_LANG, PATH_XMLFORM, $form) ), $form->fields); diff --git a/workflow/engine/classes/PopupMenu.php b/workflow/engine/classes/PopupMenu.php index ac59410b0..8d0134474 100644 --- a/workflow/engine/classes/PopupMenu.php +++ b/workflow/engine/classes/PopupMenu.php @@ -8,7 +8,7 @@ * @package workflow.engine.ProcessMaker * @copyright COLOSA */ -class PopupMenu extends form +class PopupMenu extends Form { var $type = 'PopupMenu'; var $theme = 'processmaker'; @@ -37,7 +37,7 @@ class PopupMenu extends form $label = str_replace( "\n", ' ', $label ); $pmXmlNode = new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $tableId . '.showHideField("' . $f . '")' ) ); - $this->fields[$f] = new XmlForm_Field_PopupOption( $pmXmlNode ); + $this->fields[$f] = new XmlFormFieldPopupOption( $pmXmlNode ); $this->values[$f] = ''; } } diff --git a/workflow/engine/classes/PropelTable.php b/workflow/engine/classes/PropelTable.php index 40383cd50..39fa1c209 100644 --- a/workflow/engine/classes/PropelTable.php +++ b/workflow/engine/classes/PropelTable.php @@ -75,7 +75,7 @@ class PropelTable public $name = 'pagedTable'; public $id = 'A1'; public $disableFooter = false; - //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlForm_Field_cellMark) + //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlFormFieldCellMark) public $tdStyle = ''; public $tdClass = ''; //Config Save definition diff --git a/workflow/engine/classes/ToolBar.php b/workflow/engine/classes/ToolBar.php index 94b69a786..8fae53c1b 100644 --- a/workflow/engine/classes/ToolBar.php +++ b/workflow/engine/classes/ToolBar.php @@ -1,6 +1,6 @@ home = $home; } diff --git a/workflow/engine/classes/XmlFormFieldToolButton.php b/workflow/engine/classes/XmlFormFieldToolButton.php index b5a196e76..855df7bab 100644 --- a/workflow/engine/classes/XmlFormFieldToolButton.php +++ b/workflow/engine/classes/XmlFormFieldToolButton.php @@ -6,7 +6,7 @@ * * @package workflow.engine.ProcessMaker */ -class XmlFormFieldToolButton extends XmlForm_Field +class XmlFormFieldToolButton extends XmlFormField { public $file = ''; public $fileAlt = ''; diff --git a/workflow/engine/classes/XmlForm_Field_CheckBoxTable.php b/workflow/engine/classes/XmlForm_Field_CheckBoxTable.php index efe824f42..d6d3f7e29 100644 --- a/workflow/engine/classes/XmlForm_Field_CheckBoxTable.php +++ b/workflow/engine/classes/XmlForm_Field_CheckBoxTable.php @@ -1,10 +1,10 @@ id = urlDecode( $_POST['form'] ); $G_FORM->values = $_SESSION[$G_FORM->id]; diff --git a/workflow/engine/methods/users/myInfo_Edit.php b/workflow/engine/methods/users/myInfo_Edit.php index 81091d39c..a6b3f1642 100644 --- a/workflow/engine/methods/users/myInfo_Edit.php +++ b/workflow/engine/methods/users/myInfo_Edit.php @@ -25,7 +25,7 @@ try { global $RBAC; $RBAC->requirePermissions( 'PM_LOGIN' ); - // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package + // deprecated the class XmlFormFieldImage is currently part of the class.xmlform.php package // the use of the external xmlfield_Image is highly discouraged unset( $_SESSION['CURRENT_USER'] );