[Phphtmllib-devel] SF.net SVN: phphtmllib:[3556] branches/BRANCH_2_X/phphtmllib
Status: Beta
Brought to you by:
hemna
From: <mpw...@us...> - 2012-03-11 11:26:18
|
Revision: 3556 http://phphtmllib.svn.sourceforge.net/phphtmllib/?rev=3556&view=rev Author: mpwalsh8 Date: 2012-03-11 11:26:12 +0000 (Sun, 11 Mar 2012) Log Message: ----------- Fixed PHP5 notices and warnings due to E_STRICT setting. Modified Paths: -------------- branches/BRANCH_2_X/phphtmllib/HTMLTagClass.inc branches/BRANCH_2_X/phphtmllib/XMLTagClass.inc branches/BRANCH_2_X/phphtmllib/form/form_elements/FEListBoxMaster.inc branches/BRANCH_2_X/phphtmllib/form/form_elements/FEText.inc branches/BRANCH_2_X/phphtmllib/widgets/ButtonPanel.inc branches/BRANCH_2_X/phphtmllib/widgets/DialogWidget.inc branches/BRANCH_2_X/phphtmllib/widgets/xml/XMLDocumentClass.inc Modified: branches/BRANCH_2_X/phphtmllib/HTMLTagClass.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/HTMLTagClass.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/HTMLTagClass.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -216,7 +216,7 @@ //lets call the special render tag debug function return $this->_render_tag_debug( $indent_level ); } else { - return XMLTag::_render_open_tag($indent_level, $this->_flags & _XHTMLCOMPLIANT); + return parent::_render_open_tag($indent_level, $this->_flags & _XHTMLCOMPLIANT); } } @@ -234,7 +234,7 @@ if ( $output_debug ) { return $this->_render_content_debug( $indent_level ); } else { - return XMLTag::_render_content( $indent_level, $output_debug); + return parent::_render_content( $indent_level, $output_debug); } } @@ -251,7 +251,7 @@ if ( $output_debug ) { return $this->_render_close_tag_debug( $indent_level ); } else { - return XMLTag::_render_close_tag($indent_level); + return parent::_render_close_tag($indent_level); } } Modified: branches/BRANCH_2_X/phphtmllib/XMLTagClass.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/XMLTagClass.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/XMLTagClass.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -85,13 +85,13 @@ * This function is responsible * for rendering the tag and * its contents - * - * {@source } + * + * {@source } * * @param int - the current indentation * level for the tag */ - function render( $indent_level=0 ) { + function render( $indent_level=0, $output_debug=0 ) { //try and guess the indentation flags //based on the data Modified: branches/BRANCH_2_X/phphtmllib/form/form_elements/FEListBoxMaster.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/form/form_elements/FEListBoxMaster.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/form/form_elements/FEListBoxMaster.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -32,7 +32,7 @@ * * @param array data_list - list of data elements (name=>value) */ - function set_list_data($data) { + function set_list_data($data =array()) { $this->_mdata = $data; Modified: branches/BRANCH_2_X/phphtmllib/form/form_elements/FEText.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/form/form_elements/FEText.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/form/form_elements/FEText.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -128,7 +128,7 @@ * It validates as is_email(). * @param FormValidation object. */ - function validate($_FormValidation) { + function validate(&$_FormValidation) { if (!$_FormValidation->is_email($this->get_value(), $this->_allow_name)) { $this->set_error_message( $_FormValidation->get_error_message() ); return FALSE; Modified: branches/BRANCH_2_X/phphtmllib/widgets/ButtonPanel.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/widgets/ButtonPanel.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/widgets/ButtonPanel.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -54,7 +54,7 @@ * render the entire table. * */ - function render($indent_level, $output_debug=0) { + function render($indent_level=0, $output_debug=0) { $div =& $this->_build_wrapper(); Modified: branches/BRANCH_2_X/phphtmllib/widgets/DialogWidget.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/widgets/DialogWidget.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/widgets/DialogWidget.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -59,7 +59,7 @@ * data and the buttons * */ - function render($indent_level, $output_debug=0) { + function render($indent_level=0, $output_debug=0) { $table = html_table($this->get_width(), 0, 0, 0, $this->get_align()); Modified: branches/BRANCH_2_X/phphtmllib/widgets/xml/XMLDocumentClass.inc =================================================================== --- branches/BRANCH_2_X/phphtmllib/widgets/xml/XMLDocumentClass.inc 2012-03-11 11:24:39 UTC (rev 3555) +++ branches/BRANCH_2_X/phphtmllib/widgets/xml/XMLDocumentClass.inc 2012-03-11 11:26:12 UTC (rev 3556) @@ -182,7 +182,7 @@ * * @return string the raw html output. */ - function render( $indent_level = 0) { + function render( $indent_level = 0, $output_debug=0) { //render the http header and xml header $output = $this->_render_header(); @@ -315,7 +315,7 @@ * @return XMLtag object */ function _create_xml_obj() { - $this->_xml_obj = &new XMLtag( array("version" => "1.0") ); + $this->_xml_obj = new XMLtag( array("version" => "1.0") ); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |